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

Timestamp:

Dec 16, 2014 8:45:06 PM (10 years ago)

Author:

vboxsync

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

97307

Message:

Additions/x11/VBoxClient: do not bail out if xrandr fails, as this is usually due to an inherent race in the protocol.

File:

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

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

@@ -121 +121 @@
 {
     char szCommand[256];
-    int status;
     uint32_t i;
 
+    /** @note The xrandr command can fail if something else accesses RandR at
+     *  the same time.  We just ignore failure for now and let the user try
+     *  again as we do not know what someone else is doing. */
     if (iDisplay >= pState->cSizeHints)
     {
@@ -149 +151 @@
         RTStrPrintf(szCommand, sizeof(szCommand),
                     "%s -s %ux%u", pState->pcszXrandr, cx, cy);
-        status = system(szCommand);
-        if (WEXITSTATUS(status) != 0)
-            VBClFatalError(("Failed to execute \\\"%s\\\".\n", szCommand));
+        system(szCommand);
     }
     else
@@ -162 +162 @@
                         "%s --output VGA-%u --auto --pos %ux%u",
                         pState->pcszXrandr, iDisplay, x, y);
-            status = system(szCommand);
-            if (WEXITSTATUS(status) != 0)
-                VBClFatalError(("Failed to execute \\\"%s\\\".\n", szCommand));
+            system(szCommand);
         }
         if ((!fChangeOrigin || fEnabled) && cx != 0 && cy != 0)
@@ -171 +169 @@
                         "%s --output VGA-%u --preferred",
                         pState->pcszXrandr, iDisplay);
-            status = system(szCommand);
-            if (WEXITSTATUS(status) != 0)
-                VBClFatalError(("Failed to execute \\\"%s\\\".\n", szCommand));
+            system(szCommand);
         }
         if (!fEnabled)
@@ -181 +177 @@
                         "%s --output VGA-%u --off",
                          pState->pcszXrandr, iDisplay);
-            status = system(szCommand);
-            if (WEXITSTATUS(status) != 0)
-                VBClFatalError(("Failed to execute \\\"%s\\\".\n", szCommand));
+            system(szCommand);
         }
     }