diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-01-15 16:38:23 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-01-15 16:38:23 +0100 |
commit | 013a6ba3c500ead26e4210699d177f4b485ceb7d (patch) | |
tree | 08946e0daa69eec4d1878919de2112e713b85102 /nx-X11/programs | |
parent | faae65fb3693fd1020e740e00f9038607bc4a430 (diff) | |
parent | f8b75926363cd9f337e2b95fe6e5301b21f76ed5 (diff) | |
download | nx-libs-013a6ba3c500ead26e4210699d177f4b485ceb7d.tar.gz nx-libs-013a6ba3c500ead26e4210699d177f4b485ceb7d.tar.bz2 nx-libs-013a6ba3c500ead26e4210699d177f4b485ceb7d.zip |
Merge branch 'uli42-pr/fix_unusable_mouse_in_fullscreen' into 3.6.x
Attributes GH PR #984: https://github.com/ArcticaProject/nx-libs/pull/984
Diffstat (limited to 'nx-X11/programs')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Init.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c index d760b0c6a..e8e230956 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Init.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c @@ -610,7 +610,14 @@ void OsVendorEndRedirectErrorFFunction(void) nxagentEndRedirectToClientsLog(); } -ServerGrabInfoRec nxagentGrabServerInfo; + +/* + * In an uninialized nxagentGrabServerInfo .grabstate is 0 which is the + * value of SERVER_GRABBED. Therefore we need to initialize .grabstate + * with SERVER_UNGRABBED. A check in Screen.c would go wrong + * otherwise. + */ +ServerGrabInfoRec nxagentGrabServerInfo = {.grabstate = SERVER_UNGRABBED, .client = NULL}; static void nxagentGrabServerCallback(CallbackListPtr *callbacks, void *data, void *args) |