Changeset 83173 in vbox for trunk/src/VBox/Additions

Timestamp:

Feb 27, 2020 2:12:10 PM (5 years ago)

Author:

vboxsync

Message:

bugref:9637. Some fixes

File:

• trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp

@@ -171 +171 @@
     else
     {
-        getMonitorIdFromName("virtual123");
         mpMonitorPositions = (RTPOINT*)malloc(x11Context.hOutputCount * sizeof(RTPOINT));
         /** @todo memset? */
@@ -192 +191 @@
         }
         if (iMonitorCount > 0)
-            mHostMonitorPositionSendCallback(mpMonitorPositions, x11Context.hOutputCount);
+            sendMonitorPositions(mpMonitorPositions, x11Context.hOutputCount);
     }
     XRRFreeMonitors(pMonitorInfo);
@@ -307 +306 @@
         XCloseDisplay(x11Context.pDisplay);
         x11Context.pDisplay = NULL;
+        return;
     }
     if (!XRRQueryExtension(x11Context.pDisplay, &x11Context.hRandREventBase, &x11Context.hRandRErrorBase))
@@ -312 +312 @@
         XCloseDisplay(x11Context.pDisplay);
         x11Context.pDisplay = NULL;
+        return;
     }
     if (!XRRQueryVersion(x11Context.pDisplay, &x11Context.hRandRMajor, &x11Context.hRandRMinor))
@@ -317 +318 @@
         XCloseDisplay(x11Context.pDisplay);
         x11Context.pDisplay = NULL;
+        return;
     }
     x11Context.hEventMask = 0;