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

Fix window stack api and Desktop::WindowForClientLooperPort lock assert.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42526 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Clemens Zeidler
2011-08-01 00:56:23 +00:00
parent b0af58132b
commit 2dae355ecb
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/WindowStack.cpp
+2 -1
View File
@@ -163,7 +163,7 @@ BWindowStack::HasWindow(const BMessenger& window)
int32 code = B_ERROR; int32 code = B_ERROR;
fLink->FlushWithReply(code); fLink->FlushWithReply(code);
if (code != B_OK) if (code != B_OK)
return code; return false;
bool hasWindow; bool hasWindow;
if (fLink->Read<bool>(&hasWindow) != B_OK) if (fLink->Read<bool>(&hasWindow) != B_OK)
@@ -205,5 +205,6 @@ BWindowStack::_StartMessage(int32 what)
{ {
fLink->StartMessage(AS_TALK_TO_DESKTOP_LISTENER); fLink->StartMessage(AS_TALK_TO_DESKTOP_LISTENER);
fLink->Attach<int32>(kMagicSATIdentifier); fLink->Attach<int32>(kMagicSATIdentifier);
fLink->Attach<int32>(kStacking);
return fLink->Attach<int32>(what); return fLink->Attach<int32>(what);
} }
src/servers/app/Desktop.cpp
+1 -1
View File
@@ -2643,7 +2643,7 @@ Desktop::AllWindows()
Window* Window*
Desktop::WindowForClientLooperPort(port_id port) Desktop::WindowForClientLooperPort(port_id port)
{ {
ASSERT(fWindowLock.IsReadLocked()); ASSERT_MULTI_LOCKED(fWindowLock);
for (Window* window = fAllWindows.FirstWindow(); window != NULL; for (Window* window = fAllWindows.FirstWindow(); window != NULL;
window = window->NextWindow(kAllWindowList)) { window = window->NextWindow(kAllWindowList)) {