29 lines
1.4 KiB
Diff
29 lines
1.4 KiB
Diff
diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
|
|
index 2364c5624..c977bee4c 100644
|
|
--- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp
|
|
+++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
|
|
@@ -467,7 +467,8 @@ void PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgr
|
|
// Always fill in the "printhost_port" combo box from the config and select it.
|
|
{
|
|
Choice* choice = dynamic_cast<Choice*>(m_optgroup->get_field("printhost_port"));
|
|
- choice->set_values({ m_config->opt_string("printhost_port") });
|
|
+ const wxArrayString printhost_port = wxArrayString{ m_config->opt_string("printhost_port") };
|
|
+ choice->set_values(printhost_port);
|
|
choice->set_selection();
|
|
}
|
|
|
|
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
|
|
index 2d00674c0..011ef7cfd 100644
|
|
--- a/src/slic3r/GUI/Plater.cpp
|
|
+++ b/src/slic3r/GUI/Plater.cpp
|
|
@@ -5425,7 +5425,8 @@ void Plater::load_project(const wxString& filename)
|
|
|
|
p->reset();
|
|
|
|
- if (! load_files({ into_path(filename) }).empty()) {
|
|
+ boost::filesystem::path full_path = into_path(filename);
|
|
+ if (! load_files({ full_path }, true, true).empty()) {
|
|
// At least one file was loaded.
|
|
p->set_project_filename(filename);
|
|
// Save the names of active presets and project specific config into ProjectDirtyStateManager.
|