Merge branch 'main' into main

SoftFever · May 19, 2024 · b8235bf · b8235bf
2 parents 1a7700a + 3f83d68
commit b8235bf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
@@ -1268,7 +1268,7 @@ void Sidebar::update_all_preset_comboboxes()
 
     // Orca:: show device tab based on vendor type
     p_mainframe->show_device(use_bbl_network);
-    p_mainframe->select_tab(MainFrame::tp3DEditor);
+    p_mainframe->m_tabpanel->SetSelection(p_mainframe->m_tabpanel->GetSelection());
 }
 
 void Sidebar::update_presets(Preset::Type preset_type)

diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
@@ -1172,8 +1172,10 @@ void Tab::load_config(const DynamicPrintConfig& config)
 // Reload current $self->{config} (aka $self->{presets}->edited_preset->config) into the UI fields.
 void Tab::reload_config()
 {
-    if (m_active_page)
-        m_active_page->reload_config();
+    //if (m_active_page)
+    //    m_active_page->reload_config();
+    for (auto page : m_pages)
+        page->reload_config();
 }
 
 void Tab::update_mode()