aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2018-03-15 08:45:54 +0100
committerMihai Moldovan <ionic@ionic.de>2018-03-15 08:45:54 +0100
commit15e955545ee32ca238a8dd83c8eb893dfac66d6f (patch)
tree4e3c3e2102f03bdeb5c78d34fb6c0062d7e12c6c
parent6f8cdebc6c3af00bf40fc56121763c7de9634e03 (diff)
downloadnx-libs-15e955545ee32ca238a8dd83c8eb893dfac66d6f.tar.gz
nx-libs-15e955545ee32ca238a8dd83c8eb893dfac66d6f.tar.bz2
nx-libs-15e955545ee32ca238a8dd83c8eb893dfac66d6f.zip
nx-X11/programs/Xserver/hw/nxagent/Screen.c: do not try to set a NULL mode if the output was disconnected before.
Fixes: ArcticaProject/nx-libs#677
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Screen.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 333fda743..27398474a 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -4237,12 +4237,12 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
#endif
RROutputSetModes(pScrPriv->outputs[i], &mymode, 1, 0);
}
- } /* if disable_output */
- #ifdef DEBUG
- fprintf(stderr, "nxagentAdjustRandRXinerama: setting mode [%s] ([%p]) refcnt [%d] for crtc %d\n", mymode->name, (void *) mymode, mymode->refcnt, i);
- #endif
- RRCrtcSet(pScrPriv->crtcs[i], mymode, new_x, new_y, RR_Rotate_0, 1, &(pScrPriv->outputs[i]));
+ #ifdef DEBUG
+ fprintf(stderr, "nxagentAdjustRandRXinerama: setting mode [%s] ([%p]) refcnt [%d] for crtc %d\n", mymode->name, (void *) mymode, mymode->refcnt, i);
+ #endif
+ RRCrtcSet(pScrPriv->crtcs[i], mymode, new_x, new_y, RR_Rotate_0, 1, &(pScrPriv->outputs[i]));
+ } /* if disable_output */
/* throw away the mode if otherwise unused. We do not need it
anymore. We call FreeResource() to ensure the system will not