RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 10:57:35 +00:00
Code Issues Activity Actions

Taskbar: Use Process::spawn_or_show_error() for shutdown actions

Browse source
This commit is contained in:
MacDue 2023-03-13 20:35:34 +00:00 • committed by Linus Groh
parent e46b9c189e
commit 43529ea25e
3 changed files with 17 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Userland/Services/Taskbar/ShutdownDialog.cpp
View file

@ -18,24 +18,23 @@
struct Option {
DeprecatedString title;
Vector<char const*> cmd;
ShutdownDialog::Command command;
bool enabled;
bool default_action;
};
static Vector<Option> const options = {
{ "Power off computer", { "/bin/shutdown", "--now", nullptr }, true, true },
{ "Reboot", { "/bin/reboot", nullptr }, true, false },
{ "Log out", { "/bin/logout", nullptr }, true, false },
static Array const options = {
Option { "Power off computer", { "/bin/shutdown"sv, { "--now" } }, true, true },
Option { "Reboot", { "/bin/reboot"sv, {} }, true, false },
Option { "Log out", { "/bin/logout"sv, {} }, true, false },
};
Vector<char const*> ShutdownDialog::show()
Optional<ShutdownDialog::Command const&> ShutdownDialog::show()
{
auto dialog = ShutdownDialog::construct();
auto rc = dialog->exec();
if (rc == ExecResult::OK && dialog->m_selected_option != -1)
return options[dialog->m_selected_option].cmd;
return options[dialog->m_selected_option].command;
return {};
}