Changeset 41207 in vbox for trunk/src

Timestamp:

May 8, 2012 1:53:03 PM (13 years ago)

Author:

vboxsync

Message:

Additions/x11: VBoxClient should fail gracefully if the guest driver is not available.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• display.cpp (modified) (1 diff)
• seamless.cpp (modified) (1 diff)

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

@@ -173 +173 @@
                              | VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED,
                              RT_INDEFINITE_WAIT, &fEvents);
+        if (RT_FAILURE(rc) && rc != VERR_INTERRUPTED)  /* VERR_NO_MEMORY? */
+            return rc;
         /* Jiggle the mouse pointer to wake up the driver. */
         XGrabPointer(pDisplay,

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

@@ -40 +40 @@
             return VERR_NOT_SUPPORTED;
         }
-        mSeamless.init();
+        int rc = mSeamless.init();
+        if (RT_FAILURE(rc))
+            return rc;
         /* Stay running as long as X does... */
         Display *pDisplay = XOpenDisplay(NULL);