Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/prusa3d/PrusaSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbubnikv <bubnikv@gmail.com>2018-06-07 23:10:49 +0300
committerbubnikv <bubnikv@gmail.com>2018-06-07 23:10:49 +0300
commit2b5a1f3e606eff6f07a104539f1af1178679e2d0 (patch)
tree55fe48893faf8367c87b1b54ef935f1952659854 /xs/src/slic3r/GUI/GUI.cpp
parent7dfe2e25950f20c305bf5b0c2757cc4eb0d064e4 (diff)
parentaef0c489e31ad4916b5e93dfb7b17e0200184868 (diff)
Merge remote-tracking branch 'remotes/origin/vk-bugfixes'
Diffstat (limited to 'xs/src/slic3r/GUI/GUI.cpp')
-rw-r--r--xs/src/slic3r/GUI/GUI.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/xs/src/slic3r/GUI/GUI.cpp b/xs/src/slic3r/GUI/GUI.cpp
index 0170c5526..3a8f2163f 100644
--- a/xs/src/slic3r/GUI/GUI.cpp
+++ b/xs/src/slic3r/GUI/GUI.cpp
@@ -358,8 +358,7 @@ void add_config_menu(wxMenuBar *menu, int event_preferences_changed, int event_l
Config::SnapshotDB::singleton().restore_snapshot(dlg.snapshot_to_activate(), *g_AppConfig).id);
g_PresetBundle->load_presets(*g_AppConfig);
// Load the currently selected preset into the GUI, update the preset selection box.
- for (Tab *tab : g_tabs_list)
- tab->load_current_preset();
+ load_current_presets();
}
}
break;
@@ -453,9 +452,8 @@ void config_wizard(int reason)
show_error(nullptr, e.what());
}
- // Load the currently selected preset into the GUI, update the preset selection box.
- for (Tab *tab : g_tabs_list)
- tab->load_current_preset();
+ // Load the currently selected preset into the GUI, update the preset selection box.
+ load_current_presets();
}
void open_preferences_dialog(int event_preferences)
@@ -607,6 +605,13 @@ void add_created_tab(Tab* panel)
g_wxTabPanel->AddPage(panel, panel->title());
}
+void load_current_presets()
+{
+ for (Tab *tab : g_tabs_list) {
+ tab->load_current_preset();
+ }
+}
+
void show_error(wxWindow* parent, const wxString& message) {
ErrorDialog msg(parent, message);
msg.ShowModal();