Changeset 23170 in vbox for trunk/src/VBox/Frontends

Timestamp:

Sep 21, 2009 9:25:13 AM (15 years ago)

Author:

vboxsync

Message:

VBoxSDL: be more tolerant on video driver initialization failures

Location:

trunk/src/VBox/Frontends/VBoxSDL

Files:

• Framebuffer.cpp (modified) (3 diffs)
• Framebuffer.h (modified) (1 diff)
• VBoxSDL.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp

@@ -163 +163 @@
 }
 
-void VBoxSDLFB::init(bool fShowSDLConfig)
+bool VBoxSDLFB::init(bool fShowSDLConfig)
 {
     LogFlow(("VBoxSDLFB::init\n"));
@@ -187 +187 @@
     {
         RTPrintf("SDL Error: '%s'\n", SDL_GetError());
-        return;
+        return false;
     }
 
@@ -233 +233 @@
         }
     }
+
+    return true;
 }
 

trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.h

@@ -56 +56 @@
     virtual ~VBoxSDLFB();
 
-    static void init(bool fShowSDLConfig);
+    static bool init(bool fShowSDLConfig);
     static void uninit();
 

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -1758 +1758 @@
 
     /* static initialization of the SDL stuff */
-    VBoxSDLFB::init(fShowSDLConfig);
+    if (!VBoxSDLFB::init(fShowSDLConfig))
+        goto leave;
 
     gMachine->COMGETTER(MonitorCount)(&gcMonitors);
@@ -2730 +2731 @@
     {
 # ifdef VBOXSDL_WITH_X11
-        Cursor pDefaultTempX11Cursor = *(Cursor*)gpDefaultCursor->wm_cursor;
-        *(Cursor*)gpDefaultCursor->wm_cursor = gpDefaultOrigX11Cursor;
+        Cursor pDefaultTempX11Cursor = NULL;
+        if (gfXCursorEnabled)
+        {
+            pDefaultTempX11Cursor = *(Cursor*)gpDefaultCursor->wm_cursor;
+            *(Cursor*)gpDefaultCursor->wm_cursor = gpDefaultOrigX11Cursor;
+        }
 # endif /* VBOXSDL_WITH_X11 */
         SDL_SetCursor(gpDefaultCursor);