From 167570559f82c8c7fa5bf51a5b33a0ca78c7c26d Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 2 Oct 2025 19:42:24 +0800
Subject: [PATCH] Move settings save to post-confirmation for actions

Previously, `Context.API.SaveAppAllSettings()` was called unconditionally before user confirmation for shutdown, restart, and advanced restart actions. This change ensures settings are only saved if the user confirms the action by clicking "Yes" in the confirmation dialog.

For all three functionalities:
- Moved the settings save call inside the `if (result == MessageBoxResult.Yes)` block.
- Retained the existing logic for executing the respective system commands, with checks for `EnableShutdownPrivilege()` to determine whether to use `PInvoke.ExitWindowsEx` or the `shutdown` command.

This change prevents unnecessary settings saves when the user cancels the action.
---
 Plugins/Flow.Launcher.Plugin.Sys/Main.cs | 30 ++++++++++++------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
index d0eb339fe..b53c0261b 100644
--- a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
@@ -210,16 +210,16 @@ namespace Flow.Launcher.Plugin.Sys
                             Localize.flowlauncher_plugin_sys_dlgtext_shutdown_computer(),
                             Localize.flowlauncher_plugin_sys_shutdown_computer(),
                             MessageBoxButton.YesNo, MessageBoxImage.Warning);
-
-                        // Save settings before shutdown to avoid data loss
-                        Context.API.SaveAppAllSettings();
-
                         if (result == MessageBoxResult.Yes)
+                        {
+                            // Save settings before shutdown to avoid data loss
+                            Context.API.SaveAppAllSettings();
+
                             if (EnableShutdownPrivilege())
                                 PInvoke.ExitWindowsEx(EXIT_WINDOWS_FLAGS.EWX_SHUTDOWN | EXIT_WINDOWS_FLAGS.EWX_POWEROFF, REASON);
                             else
                                 Process.Start("shutdown", "/s /t 0");
-
+                        }
                         return true;
                     }
                 },
@@ -234,16 +234,16 @@ namespace Flow.Launcher.Plugin.Sys
                             Localize.flowlauncher_plugin_sys_dlgtext_restart_computer(),
                             Localize.flowlauncher_plugin_sys_restart_computer(),
                             MessageBoxButton.YesNo, MessageBoxImage.Warning);
-
-                        // Save settings before restart to avoid data loss
-                        Context.API.SaveAppAllSettings();
-
                         if (result == MessageBoxResult.Yes)
+                        {
+                            // Save settings before restart to avoid data loss
+                            Context.API.SaveAppAllSettings();
+
                             if (EnableShutdownPrivilege())
                                 PInvoke.ExitWindowsEx(EXIT_WINDOWS_FLAGS.EWX_REBOOT, REASON);
                             else
                                 Process.Start("shutdown", "/r /t 0");
-
+                        }
                         return true;
                     }
                 },
@@ -258,16 +258,16 @@ namespace Flow.Launcher.Plugin.Sys
                             Localize.flowlauncher_plugin_sys_dlgtext_restart_computer_advanced(),
                             Localize.flowlauncher_plugin_sys_restart_computer(),
                             MessageBoxButton.YesNo, MessageBoxImage.Warning);
-
-                        // Save settings before restart to avoid data loss
-                        Context.API.SaveAppAllSettings();
-
                         if (result == MessageBoxResult.Yes)
+                        {
+                            // Save settings before restart to avoid data loss
+                            Context.API.SaveAppAllSettings();
+
                             if (EnableShutdownPrivilege())
                                 PInvoke.ExitWindowsEx(EXIT_WINDOWS_FLAGS.EWX_REBOOT | EXIT_WINDOWS_FLAGS.EWX_BOOTOPTIONS, REASON);
                             else
                                 Process.Start("shutdown", "/r /o /t 0");
-
+                        }
                         return true;
                     }
                 },