From f4103e2b13544d5799c43f69eda998e965789e50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Sun, 20 Apr 2008 21:22:16 +0000
Subject: [PATCH] Reverted r25084, and fixed bug #1762 again as suggested by
 Korli on the mailing list.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25091 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/kits/app/Application.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/kits/app/Application.cpp b/src/kits/app/Application.cpp
index d6a968b5e6..dccea30962 100644
--- a/src/kits/app/Application.cpp
+++ b/src/kits/app/Application.cpp
@@ -1350,7 +1350,6 @@ BApplication::write_drag(_BSession_ *session, BMessage *message)
 bool
 BApplication::_WindowQuitLoop(bool quitFilePanels, bool force)
 {
-	bool canQuit = true;
 	int32 index = 0;
 	while (true) {
 		 BWindow *window = WindowAt(index);
@@ -1365,8 +1364,7 @@ BApplication::_WindowQuitLoop(bool quitFilePanels, bool force)
 			continue;
 
 		// don't quit file panels if we haven't been asked for it
-		if (quitFilePanels ^ window->IsFilePanel()) {
-			canQuit = false;
+		if (!quitFilePanels && window->IsFilePanel()) {
 			window->Unlock();
 			index++;
 			continue;
@@ -1389,7 +1387,7 @@ BApplication::_WindowQuitLoop(bool quitFilePanels, bool force)
 			// we need to continue at the start of the list again - it
 			// might have changed
 	}
-	return canQuit;
+	return true;
 }
 
 
@@ -1403,7 +1401,7 @@ BApplication::_QuitAllWindows(bool force)
 	Unlock();
 
 	bool quit = _WindowQuitLoop(false, force);
-	if (!quit)
+	if (quit)
 		quit = _WindowQuitLoop(true, force);
 
 	Lock();