From 10143d6ccd06fa24a8fd2fcfb681fe9d1a261c30 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Wed, 24 May 2023 16:11:48 +0200 Subject: [PATCH] =?UTF-8?q?Fix=20for=20#10636=20-=20=20[2.6.0=20=C3=9F2]?= =?UTF-8?q?=20Filament=20color=20selected=20in=20Filament=20menu=20does=20?= =?UTF-8?q?not=20transfer=20to=20main=20screen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/slic3r/GUI/Plater.cpp | 2 +- src/slic3r/GUI/PresetComboBoxes.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 5c83e192d9..d367f1f19b 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -4039,11 +4039,11 @@ void Plater::priv::on_select_preset(wxCommandEvent &evt) // revert previously selection const std::string& old_name = wxGetApp().preset_bundle->filaments.get_edited_preset().name; wxGetApp().preset_bundle->set_filament_preset(idx, old_name); - combo->update(); } else // Synchronize config.ini with the current selections. wxGetApp().preset_bundle->export_selections(*wxGetApp().app_config); + combo->update(); } else if (select_preset) { wxWindowUpdateLocker noUpdates(sidebar->presets_panel()); diff --git a/src/slic3r/GUI/PresetComboBoxes.cpp b/src/slic3r/GUI/PresetComboBoxes.cpp index f5496833ad..7a2e0de69c 100644 --- a/src/slic3r/GUI/PresetComboBoxes.cpp +++ b/src/slic3r/GUI/PresetComboBoxes.cpp @@ -820,6 +820,8 @@ void PlaterPresetComboBox::update() // Extruder color is not defined. extruder_color.clear(); selected_filament_preset = extruder_filaments.get_selected_preset(); + if (selected_filament_preset->is_dirty) + selected_filament_preset = &m_preset_bundle->filaments.get_edited_preset(); assert(selected_filament_preset); }