From 8a24526e3fa84674a58568f204acafc08bffd219 Mon Sep 17 00:00:00 2001 From: Philippe Saint-Pierre Date: Thu, 13 Dec 2012 19:35:51 -0500 Subject: [PATCH] LaunchBox: remove redundant Locking. Thanks Stippi! --- src/apps/launchbox/MainWindow.cpp | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/apps/launchbox/MainWindow.cpp b/src/apps/launchbox/MainWindow.cpp index 690fd90717..18b931600b 100644 --- a/src/apps/launchbox/MainWindow.cpp +++ b/src/apps/launchbox/MainWindow.cpp @@ -91,20 +91,18 @@ MainWindow::QuitRequested() padWindowCount++; } bool canClose = true; - if (Lock()) { - if (padWindowCount == 1) { - be_app->PostMessage(B_QUIT_REQUESTED); + + 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; - } 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 canClose; }