From 51a43d58de100ee186ed1bc26b88ad8b5902a236 Mon Sep 17 00:00:00 2001 From: Stefan Markovic <57057282+stefansjfw@users.noreply.github.com> Date: Wed, 2 Feb 2022 10:54:03 +0100 Subject: [PATCH] [runner] Save settings on closing only when PT was actually running (#15926) i.e. Don't save if PT was only scheduling a restart --- src/runner/main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/runner/main.cpp b/src/runner/main.cpp index 997fd6d84a..99b6560683 100644 --- a/src/runner/main.cpp +++ b/src/runner/main.cpp @@ -391,6 +391,10 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine cmdLine.find("--dont-elevate") != std::string::npos)) { result = runner(elevated, open_settings, settings_window, openOobe); + + // Save settings on closing + auto general_settings = get_general_settings(); + PTSettingsHelper::save_general_settings(general_settings.to_json()); } else { @@ -405,10 +409,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine result = -1; } - // Save settings on closing - auto general_settings = get_general_settings(); - PTSettingsHelper::save_general_settings(general_settings.to_json()); - // We need to release the mutexes to be able to restart the application if (msi_mutex) {