Merge remote-tracking branch 'upstream/v1.5.0' into SoftFever

This commit is contained in:
SoftFever 2023-03-10 18:42:19 +08:00
commit da61839e84
19 changed files with 298 additions and 28 deletions

View file

@ -4404,7 +4404,8 @@ void GUI_App::start_sync_user_preset(bool load_immediately, bool with_progress_d
void GUI_App::stop_sync_user_preset()
{
remove_user_presets();
if (!wxGetApp().m_is_closing)
remove_user_presets();
enable_user_preset_folder(false);
if (!enable_sync)