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

* Since ShowWindow() could call ActivateWindow() again as well, we should

Browse Source 
better call Window::SetMinimized() before calling it from there.
* And since ShowWindow() calls _SendFakeMouseMoved(), we also better don't
  call it with the window lock held, or otherwise we would potentially cause
  a deadlock.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26760 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2008-08-03 16:19:25 +00:00
parent 207e176915
commit 547a7d1844
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/Desktop.cpp
+6 -1
View File
@@ -1538,8 +1538,13 @@ Desktop::ActivateWindow(Window* window)
if (window->IsMinimized()) { if (window->IsMinimized()) {
// Unlike WindowAction(), this is called from the application itself, // Unlike WindowAction(), this is called from the application itself,
// so we will just unminimize the window here. // so we will just unminimize the window here.
ShowWindow(window);
window->SetMinimized(false); window->SetMinimized(false);
UnlockAllWindows();
ShowWindow(window);
if (!LockAllWindows())
return;
} }
if (window == FrontWindow()) { if (window == FrontWindow()) {