aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-08-12 23:11:34 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-08-27 08:32:23 +0200
commita7abd45a82737bfcba7af6ba46d3f372a5f97de6 (patch)
treed157886b510eed45ca699fdc94a5c8197a1d9e38 /nx-X11/programs/Xserver
parent6f80a06fb96725e7eadf846bf0e727821aadbf47 (diff)
downloadnx-libs-a7abd45a82737bfcba7af6ba46d3f372a5f97de6.tar.gz
nx-libs-a7abd45a82737bfcba7af6ba46d3f372a5f97de6.tar.bz2
nx-libs-a7abd45a82737bfcba7af6ba46d3f372a5f97de6.zip
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
Diffstat (limited to 'nx-X11/programs/Xserver')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Screen.c12
1 files 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:");