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

runner: fix dispatching json possible crash (#8788)

Browse Source
This commit is contained in:
Andrey Nekrasov 2020-12-29 13:56:10 +03:00 committed by GitHub
parent 33866c124e
commit 9b2f1a826d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/runner/settings_window.cpp
View File

@ -151,34 +151,30 @@ void dispatch_received_json(const std::wstring& json_to_parse)
const json::JsonObject j = json::JsonObject::Parse(json_to_parse);
for (const auto& base_element : j)
{
if (!current_settings_ipc)
{
continue;
}
const auto name = base_element.Key();
const auto value = base_element.Value();
if (name == L"general")
{
apply_general_settings(value.GetObjectW());
if (current_settings_ipc != nullptr)
{
const std::wstring settings_string{ get_all_settings().Stringify().c_str() };
current_settings_ipc->send(settings_string);
}
const std::wstring settings_string{ get_all_settings().Stringify().c_str() };
current_settings_ipc->send(settings_string);
}
else if (name == L"powertoys")
{
dispatch_json_config_to_modules(value.GetObjectW());
if (current_settings_ipc != nullptr)
{
const std::wstring settings_string{ get_all_settings().Stringify().c_str() };
current_settings_ipc->send(settings_string);
}
const std::wstring settings_string{ get_all_settings().Stringify().c_str() };
current_settings_ipc->send(settings_string);
}
else if (name == L"refresh")
{
if (current_settings_ipc != nullptr)
{
const std::wstring settings_string{ get_all_settings().Stringify().c_str() };
current_settings_ipc->send(settings_string);
}
const std::wstring settings_string{ get_all_settings().Stringify().c_str() };
current_settings_ipc->send(settings_string);
}
else if (name == L"action")
{