Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LaunchBox: finish saving settings before closing the window (#6347)

Browse Source
This commit is contained in:
Philippe Saint-Pierre 2012-12-12 18:03:31 -05:00
parent d7250540e0
commit 4d6bb87ea7
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/apps/launchbox/App.cpp
View File

@ -145,11 +145,13 @@ App::_StoreSettingsIfNeeded()
BMessage settings('sett');
for (int32 i = 0; BWindow* window = WindowAt(i); i++) {
if (MainWindow* padWindow = dynamic_cast<MainWindow*>(window)) {
BMessage* windowSettings = padWindow->Settings();
if (windowSettings && padWindow->Lock()) {
padWindow->SaveSettings(windowSettings);
if (padWindow->Lock()) {
BMessage* windowSettings = padWindow->Settings();
if (windowSettings) {
padWindow->SaveSettings(windowSettings);
settings.AddMessage("window", windowSettings);
}
padWindow->Unlock();
settings.AddMessage("window", windowSettings);
}
}
}

28
src/apps/launchbox/MainWindow.cpp
View File

@ -90,19 +90,23 @@ MainWindow::QuitRequested()
if (dynamic_cast<MainWindow*>(window))
padWindowCount++;
}
if (padWindowCount == 1) {
be_app->PostMessage(B_QUIT_REQUESTED);
return false;
} else {
BAlert* alert = new BAlert(B_TRANSLATE("last chance"),
B_TRANSLATE("Really close this pad?\n"
"(The pad will not be remembered.)"),
B_TRANSLATE("Close"), B_TRANSLATE("Cancel"), NULL);
alert->SetShortcut(1, B_ESCAPE);
if (alert->Go() == 1)
return false;
bool canClose = true;
if (Lock()) {
if (padWindowCount == 1) {
be_app->PostMessage(B_QUIT_REQUESTED);
canClose = false;
} else {
BAlert* alert = new BAlert(B_TRANSLATE("last chance"),
B_TRANSLATE("Really close this pad?\n"
"(The pad will not be remembered.)"),
B_TRANSLATE("Close"), B_TRANSLATE("Cancel"), NULL);
alert->SetShortcut(1, B_ESCAPE);
if (alert->Go() == 1)
canClose = false;
}
Unlock();
}
return true;
return canClose;
}