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

checks rootLayer Pointer, since offscreen windows are not attached to RootLayer. This shouldn't have been a problem though since Offscreen windows were never Show()n

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13515 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2005-07-06 23:24:03 +00:00
parent c728a74e42
commit 4ed0f43872
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/ServerWindow.cpp
+8 -9
View File
@@ -241,10 +241,10 @@ ServerWindow::Show()
return; return;
RootLayer* rootLayer = fWinBorder->GetRootLayer(); RootLayer* rootLayer = fWinBorder->GetRootLayer();
if (rootLayer && rootLayer->Lock()) {
rootLayer->Lock(); rootLayer->ShowWinBorder(fWinBorder);
rootLayer->ShowWinBorder(fWinBorder); rootLayer->Unlock();
rootLayer->Unlock(); }
} }
//! Hides the window's WinBorder //! Hides the window's WinBorder
@@ -258,10 +258,10 @@ ServerWindow::Hide()
return; return;
RootLayer* rootLayer = fWinBorder->GetRootLayer(); RootLayer* rootLayer = fWinBorder->GetRootLayer();
if (rootLayer && rootLayer->Lock()) {
rootLayer->Lock(); rootLayer->HideWinBorder(fWinBorder);
rootLayer->HideWinBorder(fWinBorder); rootLayer->Unlock();
rootLayer->Unlock(); }
} }
@@ -650,7 +650,6 @@ ServerWindow::_DispatchMessage(int32 code, BPrivate::LinkReceiver &link)
STRACE(("DONE: ServerWindow %s: Message AS_DELETE_LAYER: Parent: %s Layer: %s\n", fTitle, parent->Name(), fCurrentLayer->Name())); STRACE(("DONE: ServerWindow %s: Message AS_DELETE_LAYER: Parent: %s Layer: %s\n", fTitle, parent->Name(), fCurrentLayer->Name()));
delete fCurrentLayer; delete fCurrentLayer;
// TODO: Does the client know about this change?
fCurrentLayer = parent; fCurrentLayer = parent;
break; break;
} }