aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-05-27 09:41:58 +0000
committermarha <marha@users.sourceforge.net>2010-05-27 09:41:58 +0000
commit7a4b1da166a484cd61cf36afa9c55062af80702a (patch)
tree0cf4e17889b372c91dd0ca22efa5d800373e6a94 /xorg-server
parent3426068372bd22820b608b72212bb7e2c339d997 (diff)
downloadvcxsrv-7a4b1da166a484cd61cf36afa9c55062af80702a.tar.gz
vcxsrv-7a4b1da166a484cd61cf36afa9c55062af80702a.tar.bz2
vcxsrv-7a4b1da166a484cd61cf36afa9c55062af80702a.zip
Do not call XSetInputFocus when the window is not realized yet because this will give an Xerror
Diffstat (limited to 'xorg-server')
-rw-r--r--xorg-server/hw/xwin/winmultiwindowwndproc.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/xorg-server/hw/xwin/winmultiwindowwndproc.c b/xorg-server/hw/xwin/winmultiwindowwndproc.c
index ef5f3114a..3ddb071e4 100644
--- a/xorg-server/hw/xwin/winmultiwindowwndproc.c
+++ b/xorg-server/hw/xwin/winmultiwindowwndproc.c
@@ -789,9 +789,8 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
/* Tell our Window Manager thread to activate the window */
wmMsg.msg = WM_WM_ACTIVATE;
- if (fWMMsgInitialized)
- if (!pWin || !pWin->overrideRedirect) /* for OOo menus */
- winSendMessageToWM (s_pScreenPriv->pWMInfo, &wmMsg);
+ if (fWMMsgInitialized && pWin->realized && !pWin->overrideRedirect /* for OOo menus */)
+ winSendMessageToWM (s_pScreenPriv->pWMInfo, &wmMsg);
}
/* Prevent the mouse wheel from stalling when another window is minimized */
if (HIWORD(wParam) == 0 && LOWORD(wParam) == WA_ACTIVE &&