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

src/apps/launchbox/App.cpp

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

src/apps/launchbox/MainWindow.cpp

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