mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-04 02:06:36 +02:00
[Hosts] Consolidate launch (#27173)
* consolidate hosts editor launch * improve readability * improve readability
This commit is contained in:
committed by
GitHub
parent
53e104e858
commit
b0cb40eaff
@@ -147,7 +147,17 @@ public:
|
||||
if (m_enabled && err == ERROR_SUCCESS)
|
||||
{
|
||||
Logger::trace(L"{} event was signaled", CommonSharedConstants::SHOW_HOSTS_EVENT);
|
||||
launch_process(false);
|
||||
|
||||
if (is_process_running())
|
||||
{
|
||||
bring_process_to_front();
|
||||
}
|
||||
else
|
||||
{
|
||||
launch_process(false);
|
||||
}
|
||||
|
||||
Trace::ActivateEditor();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -156,7 +166,17 @@ public:
|
||||
if (m_enabled && err == ERROR_SUCCESS)
|
||||
{
|
||||
Logger::trace(L"{} event was signaled", CommonSharedConstants::SHOW_HOSTS_ADMIN_EVENT);
|
||||
launch_process(true);
|
||||
|
||||
if (is_process_running())
|
||||
{
|
||||
bring_process_to_front();
|
||||
}
|
||||
else
|
||||
{
|
||||
launch_process(true);
|
||||
}
|
||||
|
||||
Trace::ActivateEditor();
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -209,31 +229,8 @@ public:
|
||||
return false;
|
||||
}
|
||||
|
||||
virtual void call_custom_action(const wchar_t* action) override
|
||||
virtual void call_custom_action(const wchar_t* /*action*/) override
|
||||
{
|
||||
try
|
||||
{
|
||||
PowerToysSettings::CustomActionObject action_object =
|
||||
PowerToysSettings::CustomActionObject::from_json_string(action);
|
||||
|
||||
if (is_process_running())
|
||||
{
|
||||
bring_process_to_front();
|
||||
}
|
||||
else if (action_object.get_name() == L"Launch")
|
||||
{
|
||||
launch_process(false);
|
||||
}
|
||||
else if (action_object.get_name() == L"LaunchAdministrator")
|
||||
{
|
||||
launch_process(true);
|
||||
}
|
||||
Trace::ActivateEditor();
|
||||
}
|
||||
catch (std::exception&)
|
||||
{
|
||||
Logger::error(L"Failed to parse action. {}", action);
|
||||
}
|
||||
}
|
||||
|
||||
virtual void set_config(const wchar_t* /*config*/) override
|
||||
|
||||
Reference in New Issue
Block a user