mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-06-07 09:28:03 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Check key existance before getting it from JSON (#1632)

Browse Source
This commit is contained in:
vldmr11080 2020-03-19 09:21:10 +01:00 committed by GitHub
parent 81710ff3b0
commit 57f763b0b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/runner/general_settings.cpp
View File

@ -207,22 +207,22 @@ void start_initial_powertoys()
try try
{ {
general_settings = load_general_settings(); general_settings = load_general_settings();
json::JsonObject enabled = general_settings.GetNamedObject(L"enabled"); if (general_settings.HasKey(L"enabled"))
for (const auto& enabled_element : enabled)
{ {
if (enabled_element.Value().GetBoolean()) json::JsonObject enabled = general_settings.GetNamedObject(L"enabled");
for (const auto& enabled_element : enabled)
{ {
// Enable this powertoy. if (enabled_element.Value().GetBoolean())
powertoys_to_enable.emplace(enabled_element.Key()); {
// Enable this powertoy.
powertoys_to_enable.emplace(enabled_element.Key());
}
} }
only_enable_some_powertoys = true;
} }
only_enable_some_powertoys = true;
} }
catch (...) catch (...)
{ {
// Couldn't read the general settings correctly.
// Load all powertoys.
// TODO: notify user about invalid json config
only_enable_some_powertoys = false; only_enable_some_powertoys = false;
} }