[X2Go-Commits] [nx-libs] 01/01: nx-X11/programs/Xserver/hw/nxagent/Screen.c: actually fix the crash, do not add an invalid mode in case an output has actually been disconnected.

git-admin at x2go.org git-admin at x2go.org
Thu Mar 15 08:29:04 CET 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x-rpm-debug
in repository nx-libs.

commit f0ee7503a4d09a0511eacbde0cfa7cc0c643d076
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Mar 15 08:28:59 2018 +0100

    nx-X11/programs/Xserver/hw/nxagent/Screen.c: actually fix the crash, do not add an invalid mode in case an output has actually been disconnected.
---
 nx-X11/programs/Xserver/hw/nxagent/Screen.c | 10 +++++-----
 1 file 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 002e1b0..c8db47a 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -4240,12 +4240,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

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list