diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-01-16 15:08:07 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-01-16 15:08:07 +0100 |
| commit | 9772277c6589b881c639285fc0b91655ac77f82c (patch) | |
| tree | 4208ccf739203d53f1c2e46eee4425c3f63a7fa2 /nx-X11/programs/Xserver | |
| parent | 7c43682e8e7a4f11af08a1b5e80244218adaa52d (diff) | |
| parent | 05dd842561f0e8261540e3313688c975e23b178b (diff) | |
| download | nx-libs-9772277c6589b881c639285fc0b91655ac77f82c.tar.gz nx-libs-9772277c6589b881c639285fc0b91655ac77f82c.tar.bz2 nx-libs-9772277c6589b881c639285fc0b91655ac77f82c.zip | |
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
Diffstat (limited to 'nx-X11/programs/Xserver')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Screen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 69c50cdf3..75e448ceb 100644 --- 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); } |