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 3e093f9eba4b84f79fc19168ef2cad25738628a4 Author: Ulrich Sibiller <uli42@gmx.de> Date: Wed Dec 30 22:48:33 2020 +0100 nxagent: make nxagentDoFullgeneration a Boolean --- nx-X11/programs/Xserver/hw/nxagent/Display.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Init.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c index e3857043b..c8a2d852a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Display.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c @@ -1796,7 +1796,7 @@ void nxagentCloseDisplay(void) nxagentDoFullGeneration, (void *) nxagentDisplay); #endif - if (nxagentDoFullGeneration == 0 || + if (!nxagentDoFullGeneration || nxagentDisplay == NULL) { return; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c index b621f62e8..7f5360636 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Init.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c @@ -171,7 +171,7 @@ int nxagentSaveUnder; * nxagentOpenScreen * InitInput */ -int nxagentDoFullGeneration = 1; +Bool nxagentDoFullGeneration = True; /* * True if agent is running as X2goAgent diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index e27ed2ec6..e272b3b02 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -1657,7 +1657,7 @@ N/A nxagentPrintAgentGeometry(NULL, "nxagentOpenScreen:"); #endif - if (nxagentDoFullGeneration == 1 || + if (nxagentDoFullGeneration || nxagentReconnectTrap) { unsigned long valuemask = CWBackPixel | CWEventMask | CWColormap; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git