From 1ca7c4e5541af8322ec52e55558905d58e470df7 Mon Sep 17 00:00:00 2001
From: tao wang <tao.wang@bambulab.com>
Date: Thu, 15 Jun 2023 16:42:52 +0800
Subject: [PATCH] FIX:fixed invalid cancellation of loading user preset

Change-Id: Ia46d1c8cd8dcd8203a248e036cea8df54af3bd64
---
 src/slic3r/GUI/GUI_App.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index 9eff850f75..40eff26719 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -4569,8 +4569,15 @@ void GUI_App::start_sync_user_preset(bool with_progress_dlg)
                 dlg->Update(percent, _L("Loading user preset"));
             });
         };
-        cancelFn = [dlg]() {
-            return dlg->WasCanceled();
+        cancelFn = [this, dlg]() {
+            bool was_canceled = dlg->WasCanceled();
+            if (was_canceled) {
+                CallAfter([=] {
+                    dlg->Destroy();
+                    reload_settings();
+                });
+            }
+            return was_canceled;
         };
         finishFn = [this, dlg] {
             CallAfter([=]{