3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 07:27:41 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix: The "Unsaved Changes Dialog" pops up, but the content display section is empty. (#7482)

Browse source 
fix:The Unsaved Changes Dialog pops up, but the content display section is empty.
This commit is contained in:
xiaoyeliu 2024-11-30 22:23:07 +08:00 • committed by GitHub
parent 449785e138
commit 2a61ceae5b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/slic3r/GUI/GUI_App.cpp
View file

@ -5647,7 +5647,8 @@ bool GUI_App::check_and_keep_current_preset_changes(const wxString& caption, con
bool is_called_from_configwizard = postponed_apply_of_keeped_changes != nullptr; bool is_called_from_configwizard = postponed_apply_of_keeped_changes != nullptr;
UnsavedChangesDialog dlg(caption, header, "", action_buttons); UnsavedChangesDialog dlg(caption, header, "", action_buttons);
if (dlg.ShowModal() == wxID_CANCEL) bool no_need_change = dlg.getUpdateItemCount() == 0 ? true : false;
if (!no_need_change && dlg.ShowModal() == wxID_CANCEL)
return false; return false;
auto reset_modifications = [this, is_called_from_configwizard]() { auto reset_modifications = [this, is_called_from_configwizard]() {
@ -5662,7 +5663,7 @@ bool GUI_App::check_and_keep_current_preset_changes(const wxString& caption, con
load_current_presets(false); load_current_presets(false);
}; };
if (dlg.discard()) if (dlg.discard() || no_need_change)
reset_modifications(); reset_modifications();
else // save selected changes else // save selected changes
{ {

2
src/slic3r/GUI/UnsavedChangesDialog.hpp
View file

@ -312,6 +312,8 @@ public:
{ {
} }
}; };
public:
int getUpdateItemCount() { return m_presetitems.size(); }
private: private:
std::vector<PresetItem> m_presetitems; std::vector<PresetItem> m_presetitems;