aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Events.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-02-05 13:02:30 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-02-05 13:02:30 +0100
commitb1c42dc98bea8b99eb8a2b1618421bdb698cf690 (patch)
tree4425126f0e53713d613274f209494be9e51534d7 /nx-X11/programs/Xserver/hw/nxagent/Events.c
parent995350d14335d8b5ef52dba47c7ae8d942901b10 (diff)
parent7db6cff1cd9f4f7c7ae8b34866dd921bddf31642 (diff)
downloadnx-libs-b1c42dc98bea8b99eb8a2b1618421bdb698cf690.tar.gz
nx-libs-b1c42dc98bea8b99eb8a2b1618421bdb698cf690.tar.bz2
nx-libs-b1c42dc98bea8b99eb8a2b1618421bdb698cf690.zip
Merge branch 'uli42-pr/some_cleanups' into 3.6.x
Attributes GH PR #626: https://github.com/ArcticaProject/nx-libs/pull/626
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Events.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Events.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c
index 0b6e0cafb..315b6572e 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c
@@ -3948,7 +3948,7 @@ void nxagentUngrabPointerAndKeyboard(XEvent *X)
XUngrabKeyboard(nxagentDisplay, now);
#ifdef TEST
- fprintf(stderr, "nxagentGrabPointerAndKeyboard: Going to ungrab the pointer in context [B6].\n");
+ fprintf(stderr, "nxagentUngrabPointerAndKeyboard: Going to ungrab the pointer in context [B6].\n");
#endif
XUngrabPointer(nxagentDisplay, now);
@@ -3958,10 +3958,11 @@ void nxagentDeactivatePointerGrab()
{
GrabPtr grab = inputInfo.pointer -> grab;
- XButtonEvent X;
-
if (grab)
{
+ XButtonEvent X;
+ memset(&X, 0, sizeof(XButtonEvent));
+
X.type = ButtonRelease;
X.serial = 0;
X.send_event = FALSE;