From 8bca36b1cdc0720ed8088baa3c9c3cb32648de0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 27 Aug 2009 09:27:03 +0000 Subject: [PATCH] * Fixed locking order reversion as spotted by Stefano. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32744 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/ServerApp.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/servers/app/ServerApp.cpp b/src/servers/app/ServerApp.cpp index 531c298e21..f90370a70d 100644 --- a/src/servers/app/ServerApp.cpp +++ b/src/servers/app/ServerApp.cpp @@ -158,9 +158,10 @@ ServerApp::~ServerApp() fWindowListLock.Unlock(); // wait for the windows to quit - snooze(20000); + fDesktop->RevertScreenModes(fTemporaryDisplayModeChange); + fWindowListLock.Lock(); for (int32 i = fWindowList.CountItems(); i-- > 0;) { ServerWindow* window = fWindowList.ItemAt(i); @@ -187,8 +188,6 @@ ServerApp::~ServerApp() fWindowListLock.Lock(); } - fDesktop->RevertScreenModes(fTemporaryDisplayModeChange); - for (int32 i = fBitmapList.CountItems(); i-- > 0;) { gBitmapManager->DeleteBitmap((ServerBitmap*)fBitmapList.ItemAt(i)); }