i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FirstBootPrompt: Another fix for #16525

Browse Source 
If we quit the app before handling the "reboot requested" message, the
system doesn't reboot.
This commit is contained in:
Adrien Destugues
2020-09-22 17:37:59 +02:00
parent 56ce1249b2
commit 0b07cea059
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/firstbootprompt/BootPromptWindow.cpp
+5 -3
View File
@@ -327,16 +327,18 @@ BootPromptWindow::QuitRequested()
"restart your system!"), "restart your system!"),
B_TRANSLATE("Cancel"), B_TRANSLATE("Restart system"), NULL, B_TRANSLATE("Cancel"), B_TRANSLATE("Restart system"), NULL,
B_WIDTH_AS_USUAL, B_STOP_ALERT); B_WIDTH_AS_USUAL, B_STOP_ALERT);
// If there is not enough memory to create the alert here, we may as
// well try to reboot. There probably isn't much else to do anyway.
if (alert != NULL) { if (alert != NULL) {
alert->SetShortcut(0, B_ESCAPE); alert->SetShortcut(0, B_ESCAPE);
if (alert->Go() == 0) { if (alert->Go() == 0)
return false; return false;
}
} }
be_app->PostMessage(MSG_REBOOT_REQUESTED); be_app->PostMessage(MSG_REBOOT_REQUESTED);
// Don't quit, instead let the app run and handle the reboot request
return false;
} else { } else {
// The aforementioned warning is only shown if the condition // The aforementioned warning is only shown if the condition
// is true, because if FirstBootPrompt is running on the Desktop, // is true, because if FirstBootPrompt is running on the Desktop,