[X2Go-Commits] [nx-libs] 203/219: Screen.c: initialize RandR only on startup...

[git-admin at x2go.org]

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 a7abd45a82737bfcba7af6ba46d3f372a5f97de6
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Mon Aug 12 23:11:34 2019 +0200

    Screen.c: initialize RandR only on startup...
    
    ... not on reconnect. After the reconnect RRCloseScreen was called
    twice which caused a double free. This was introduced with
    3b06ad51d91ff2b9442f159cddf34ed03bc2dd35
    
    Fixes ArcticaProject/nx-libs#833
---
 nx-X11/programs/Xserver/hw/nxagent/Screen.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 434389504..8285d464d 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -1735,14 +1735,14 @@ N/A
 
     #define POSITION_OFFSET (pScreen->myNum * (nxagentOption(Width) + \
                                nxagentOption(Height)) / 32)
-  }
 
-  /*
-   * Complete the initialization of the RANDR
-   * extension.
-   */
+    /*
+     * Complete the initialization of the RANDR
+     * extension.
+     */
 
-  nxagentInitRandRExtension(pScreen);
+    nxagentInitRandRExtension(pScreen);
+  }
 
   #ifdef TEST
   nxagentPrintAgentGeometry(NULL, "nxagentOpenScreen:");

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