diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-08-27 08:33:22 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-08-27 08:33:22 +0200 |
commit | daa50fd80ed5f777754a51c0e2b4869ba083a337 (patch) | |
tree | d157886b510eed45ca699fdc94a5c8197a1d9e38 /nx-X11 | |
parent | 6f80a06fb96725e7eadf846bf0e727821aadbf47 (diff) | |
parent | a7abd45a82737bfcba7af6ba46d3f372a5f97de6 (diff) | |
download | nx-libs-daa50fd80ed5f777754a51c0e2b4869ba083a337.tar.gz nx-libs-daa50fd80ed5f777754a51c0e2b4869ba083a337.tar.bz2 nx-libs-daa50fd80ed5f777754a51c0e2b4869ba083a337.zip |
Merge branch 'uli42-pr/fix_double_free' into 3.6.x
Attributes GH PR #834: https://github.com/ArcticaProject/nx-libs/pull/834
Diffstat (limited to 'nx-X11')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Screen.c | 12 |
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:"); |