Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-08 20:27:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

[runner]Save before opening settings (#25799)

Browse Source 
* Revert "[runner]Don't save settings on Settings app start (#25647)"

This reverts commit 4b1aadafc2.

* [runner]Save before opening settings
This commit is contained in:
Jaime Bernardo
2023-05-03 10:37:10 +01:00
committed by GitHub
parent c79723b03c
commit 8279ff76de
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/runner/settings_window.cpp
View File

@@ -362,8 +362,10 @@ void run_settings_window(bool show_oobe_window, bool show_scoobe_window, std::op
// Arg 4: process pid. // Arg 4: process pid.
DWORD powertoys_pid = GetCurrentProcessId(); DWORD powertoys_pid = GetCurrentProcessId();
GeneralSettings save_settings = get_general_settings();
// Arg 5: settings theme. // Arg 5: settings theme.
const std::wstring settings_theme_setting{ get_general_settings().theme }; const std::wstring settings_theme_setting{ save_settings.theme };
std::wstring settings_theme = L"system"; std::wstring settings_theme = L"system";
if (settings_theme_setting == L"dark" || (settings_theme_setting == L"system" && WindowsColors::is_dark_mode())) if (settings_theme_setting == L"dark" || (settings_theme_setting == L"system" && WindowsColors::is_dark_mode()))
{ {
@@ -371,11 +373,11 @@ void run_settings_window(bool show_oobe_window, bool show_scoobe_window, std::op
} }
// Arg 6: elevated status // Arg 6: elevated status
bool isElevated{ get_general_settings().isElevated }; bool isElevated{ save_settings.isElevated };
std::wstring settings_elevatedStatus = isElevated ? L"true" : L"false"; std::wstring settings_elevatedStatus = isElevated ? L"true" : L"false";
// Arg 7: is user an admin // Arg 7: is user an admin
bool isAdmin{ get_general_settings().isAdmin }; bool isAdmin{ save_settings.isAdmin };
std::wstring settings_isUserAnAdmin = isAdmin ? L"true" : L"false"; std::wstring settings_isUserAnAdmin = isAdmin ? L"true" : L"false";
// Arg 8: should oobe window be shown // Arg 8: should oobe window be shown
@@ -395,6 +397,10 @@ void run_settings_window(bool show_oobe_window, bool show_scoobe_window, std::op
// Args 13, .... : Optional arguments depending on the options presented before. All by the same value. // Args 13, .... : Optional arguments depending on the options presented before. All by the same value.
// create general settings file to initialize the settings file with installation configurations like :
// 1. Run on start up.
PTSettingsHelper::save_general_settings(save_settings.to_json());
std::wstring executable_args = fmt::format(L"\"{}\" {} {} {} {} {} {} {} {} {} {} {}", std::wstring executable_args = fmt::format(L"\"{}\" {} {} {} {} {} {} {} {} {} {} {}",
executable_path, executable_path,
powertoys_pipe_name, powertoys_pipe_name,