From a7abd45a82737bfcba7af6ba46d3f372a5f97de6 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Mon, 12 Aug 2019 23:11:34 +0200 Subject: 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(-) (limited to 'nx-X11') 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:"); -- cgit v1.2.3