diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-22 14:27:38 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-22 14:27:38 +0100 |
| commit | 7002c66cfba01e7d3b88dae498a195f78f0e83f5 (patch) | |
| tree | 2fbbd202a6a4243f0e64a8b22e22417a609ae19d /xorg-server/hw/xwin/winwakeup.c | |
| parent | 50c07563e17397daf040a32d8fdd3ab397e72371 (diff) | |
| parent | 470f7ca9f0be348faf2f03fc16811844c5eeffce (diff) | |
| download | vcxsrv-7002c66cfba01e7d3b88dae498a195f78f0e83f5.tar.gz vcxsrv-7002c66cfba01e7d3b88dae498a195f78f0e83f5.tar.bz2 vcxsrv-7002c66cfba01e7d3b88dae498a195f78f0e83f5.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libfontenc mesa mkfontscale pixman xserver xkeyboard-config
Conflicts:
mesalib/src/mesa/main/syncobj.c
mesalib/src/mesa/main/syncobj.h
xorg-server/hw/xwin/winconfig.c
xorg-server/hw/xwin/winmultiwindowwndproc.c
Diffstat (limited to 'xorg-server/hw/xwin/winwakeup.c')
| -rw-r--r-- | xorg-server/hw/xwin/winwakeup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/hw/xwin/winwakeup.c b/xorg-server/hw/xwin/winwakeup.c index 77c160533..795221a1a 100644 --- a/xorg-server/hw/xwin/winwakeup.c +++ b/xorg-server/hw/xwin/winwakeup.c @@ -43,8 +43,8 @@ winWakeupHandler(ScreenPtr pScreen, { MSG msg; - /* Process all messages on our queue */ - while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { + /* Process one message from our queue */ + if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { if ((g_hDlgDepthChange == 0 || !IsDialogMessage(g_hDlgDepthChange, &msg)) && (g_hDlgExit == 0 || !IsDialogMessage(g_hDlgExit, &msg)) |