Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fixed locking order reversion as spotted by Stefano. 

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32744 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2009-08-27 09:27:03 +00:00
parent a5a64d5481
commit 8bca36b1cd
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/servers/app/ServerApp.cpp
View File

@ -158,9 +158,10 @@ ServerApp::~ServerApp()
fWindowListLock.Unlock(); fWindowListLock.Unlock();
// wait for the windows to quit // wait for the windows to quit
snooze(20000); snooze(20000);
fDesktop->RevertScreenModes(fTemporaryDisplayModeChange);
fWindowListLock.Lock(); fWindowListLock.Lock();
for (int32 i = fWindowList.CountItems(); i-- > 0;) { for (int32 i = fWindowList.CountItems(); i-- > 0;) {
ServerWindow* window = fWindowList.ItemAt(i); ServerWindow* window = fWindowList.ItemAt(i);
@ -187,8 +188,6 @@ ServerApp::~ServerApp()
fWindowListLock.Lock(); fWindowListLock.Lock();
} }
fDesktop->RevertScreenModes(fTemporaryDisplayModeChange);
for (int32 i = fBitmapList.CountItems(); i-- > 0;) { for (int32 i = fBitmapList.CountItems(); i-- > 0;) {
gBitmapManager->DeleteBitmap((ServerBitmap*)fBitmapList.ItemAt(i)); gBitmapManager->DeleteBitmap((ServerBitmap*)fBitmapList.ItemAt(i));
} }