[X2Go-Commits] [nx-libs] 80/429: Init.c: Initialize nxagentGrabServerInfo

git-admin at x2go.org git-admin at x2go.org
Mon Oct 18 09:36:09 CEST 2021


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 89b37de7c923337cc403480e6db44000bdd0674a
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Tue Jan 12 22:11:49 2021 +0100

    Init.c: Initialize nxagentGrabServerInfo
    
    Fixes ArcticaProject/nx-libs#983
---
 nx-X11/programs/Xserver/hw/nxagent/Init.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c
index b06d8e239..4e2b28a59 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)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list