Changeset 84045 in vbox

Timestamp:

Apr 28, 2020 12:36:28 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

137620

Message:

bugref:9637. Calling vmware_ctrl before getting screen resources. that enables us reusing modes ctrl extension has already created.

File:

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

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

@@ -1114 +1114 @@
 static void setXrandrTopology(struct RANDROUTPUT *paOutputs)
 {
+    XGrabServer(x11Context.pDisplay);
+    callVMWCTRL(paOutputs);
+
 #ifdef WITH_DISTRO_XRAND_XINERAMA
     x11Context.pScreenResources = XRRGetScreenResources(x11Context.pDisplay, x11Context.rootWindow);
@@ -1123 +1126 @@
 
     if (!x11Context.pScreenResources)
+    {
+        XUngrabServer(x11Context.pDisplay);
         return;
-
-    XGrabServer(x11Context.pDisplay);
-    callVMWCTRL(paOutputs);
+    }
+
     /* Disable crtcs. */
     for (int i = 0; i < x11Context.pScreenResources->noutput; ++i)