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

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

src/servers/app/Desktop.cpp

@@ -1538,8 +1538,13 @@ Desktop::ActivateWindow(Window* window)
 	if (window->IsMinimized()) {
 		// Unlike WindowAction(), this is called from the application itself,
 		// so we will just unminimize the window here.
-		ShowWindow(window);
 		window->SetMinimized(false);
+		UnlockAllWindows();
+
+		ShowWindow(window);
+
+		if (!LockAllWindows())
+			return;
 	}
 
 	if (window == FrontWindow()) {