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

Reverted r25084, and fixed bug #1762 again as suggested by Korli on the mailing

Browse Source 
list.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25091 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2008-04-20 21:22:16 +00:00
parent 945fb7e32a
commit f4103e2b13
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/app/Application.cpp
+3 -5
View File
@@ -1350,7 +1350,6 @@ BApplication::write_drag(_BSession_ *session, BMessage *message)
bool bool
BApplication::_WindowQuitLoop(bool quitFilePanels, bool force) BApplication::_WindowQuitLoop(bool quitFilePanels, bool force)
{ {
bool canQuit = true;
int32 index = 0; int32 index = 0;
while (true) { while (true) {
BWindow *window = WindowAt(index); BWindow *window = WindowAt(index);
@@ -1365,8 +1364,7 @@ BApplication::_WindowQuitLoop(bool quitFilePanels, bool force)
continue; continue;
// don't quit file panels if we haven't been asked for it // don't quit file panels if we haven't been asked for it
if (quitFilePanels ^ window->IsFilePanel()) { if (!quitFilePanels && window->IsFilePanel()) {
canQuit = false;
window->Unlock(); window->Unlock();
index++; index++;
continue; continue;
@@ -1389,7 +1387,7 @@ BApplication::_WindowQuitLoop(bool quitFilePanels, bool force)
// we need to continue at the start of the list again - it // we need to continue at the start of the list again - it
// might have changed // might have changed
} }
return canQuit; return true;
} }
@@ -1403,7 +1401,7 @@ BApplication::_QuitAllWindows(bool force)
Unlock(); Unlock();
bool quit = _WindowQuitLoop(false, force); bool quit = _WindowQuitLoop(false, force);
if (!quit) if (quit)
quit = _WindowQuitLoop(true, force); quit = _WindowQuitLoop(true, force);
Lock(); Lock();