Make assert dialog work on Cocoa target even if we haven't initialize…

…d video.
libsdl-org · Apr 20, 2011 · 19396a8 · 19396a8
1 parent 576e21d
commit 19396a8
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/src/video/cocoa/SDL_cocoavideo.m b/src/video/cocoa/SDL_cocoavideo.m
@@ -20,6 +20,7 @@
 */
 #include "SDL_config.h"
 
+#include "SDL.h"
 #include "SDL_endian.h"
 #include "SDL_cocoavideo.h"
 #include "SDL_cocoashape.h"
@@ -217,6 +218,14 @@
 SDL_assert_state
 SDL_PromptAssertion_cocoa(const SDL_assert_data *data)
 {
+    const int initialized = (SDL_WasInit(SDL_INIT_VIDEO) != 0);
+    if (!initialized) {
+        if (SDL_InitSubSystem(SDL_INIT_VIDEO) == -1) {
+            fprintf(stderr, "Assertion failed AND couldn't init video mode!\n");
+            return SDL_ASSERTION_BREAK;  /* oh well, crash hard. */
+        }
+    }
+
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
     NSString *msg = [NSString stringWithFormat:
@@ -242,6 +251,11 @@
     [alert addButtonWithTitle:@"Always Ignore"];
     const NSInteger clicked = [alert runModal];
     [pool release];
+
+    if (!initialized) {
+        SDL_QuitSubSystem(SDL_INIT_VIDEO);
+    }
+
     return (SDL_assert_state) (clicked - NSAlertFirstButtonReturn);
 }