Changeset 95145 in vbox for trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp

Timestamp:

May 31, 2022 10:40:51 AM (3 years ago)

Author:

vboxsync

Message:

Additions: X11: VBoxClient: pass to XRRDestroyMode only modes created by XRRCreateMode, bugref:10222.

File:

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

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

@@ -1342 +1342 @@
             x11Context.pXRRDestroyMode(x11Context.pDisplay, aPrevMode[outputId]);
 #endif
-    }
-
-    aPrevMode[outputId] = pModeInfo->id;
+        /* Forget destroyed mode. */
+        aPrevMode[outputId] = 0;
+    }
+
+    /* Only cache modes created "by us". XRRDestroyMode will complain if provided mode
+     * was not created by XRRCreateMode call. */
+    if (fNewMode)
+        aPrevMode[outputId] = pModeInfo->id;
 
     if (paOutputs[iOutputIndex].fPrimary)
@@ -1480 +1485 @@
         if (!paOutputs[i].fEnabled)
             continue;
-        configureOutput(i, paOutputs);
+        if (configureOutput(i, paOutputs))
+            VBClLogInfo("output[%d] successfully configured\n", i);
+        else
+            VBClLogError("failed to configure output[%d]\n", i);
     }
     XSync(x11Context.pDisplay, False);