Merge branch 'sunweaver-pr/keep-disabled-rrxinerama-disabled-on-reconnects' into 3.6.x

Attributes GH PR #637: https://github.com/ArcticaProject/nx-libs/pull/637 Reviewed-by: Ulrich Sibiller <uli42@gmx.de> -- Tue, 16 Jan 2018 06:03:18 -0800

Merge branch 'sunweaver-pr/keep-disabled-rrxinerama-disabled-on-reconnects' into 3.6.x
9772277c · Mike Gabriel · 7c43682e · 05dd8425 · 9772277c
Commit 9772277c authored Jan 16, 2018 by Mike Gabriel
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Screen.c nx-X11/programs/Xserver/hw/nxagent/Screen.c +1 -1

No files found.
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -3797,7 +3797,7 @@ int nxagentChangeScreenConfig(int screen, int width, int height, int mmWidth, in
  if (r != 0)
  {
-    if (nxagentOption(Xinerama))
+    if (nxagentOption(Xinerama) && (noRRXineramaExtension == FALSE))
    {
      nxagentAdjustRandRXinerama(pScreen);
    }