mirrors/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-01-24 10:12:25 -05:00
Code Issues Projects Releases Packages Wiki Activity

SystemMenu: Fix bad behavior in shutdown dialog

Browse source 
The selected option was stored in a captured stack variable which was
long gone by the time we looked at it, so this dialog didn't really
behave the way you'd expect. Put it in a member instead. :^)
This commit is contained in:
Andreas Kling 2020-03-03 16:46:39 +01:00
parent 71e96ee728
commit b1d35248e4
Notes: sideshowbarker 2024-07-19 08:55:13 +09:00
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Applications/SystemMenu/PowerDialog.cpp
View file

@ -82,20 +82,19 @@ PowerDialog::PowerDialog()
header->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
header->set_font(Gfx::Font::default_bold_font());
int selected = -1;
for (size_t i = 0; i < options.size(); i++) {
auto action = options[i];
auto radio = main->add<GUI::RadioButton>();
radio->set_enabled(action.enabled);
radio->set_text(action.title);
radio->on_checked = [&selected, i](auto) {
selected = i;
radio->on_checked = [this, i](auto) {
m_selected_option = i;
};
if (action.default_action) {
radio->set_checked(true);
selected = i;
m_selected_option = i;
}
}
@ -104,8 +103,8 @@ PowerDialog::PowerDialog()
button_box->layout()->set_spacing(8);
auto ok_button = button_box->add<GUI::Button>();
ok_button->on_click = [this, &selected](auto&) {
done(selected);
ok_button->on_click = [this](auto&) {
done(m_selected_option);
};
ok_button->set_text("OK");

2
Applications/SystemMenu/PowerDialog.h
View file

@ -36,4 +36,6 @@ public:
private:
PowerDialog();
~PowerDialog();
int m_selected_option { -1 };
};