Commit f2b3dc5a authored by Ryan C. Gordon's avatar Ryan C. Gordon

Make assert dialog work on Cocoa target even if we haven't initialized video.

--HG--
extra : rebase_source : 04ec77f4a3a3f61fdb1255c4fc3b8c88efd68ffb
parent 36d69851
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
*/ */
#include "SDL_config.h" #include "SDL_config.h"
#include "SDL.h"
#include "SDL_endian.h" #include "SDL_endian.h"
#include "SDL_cocoavideo.h" #include "SDL_cocoavideo.h"
#include "SDL_cocoashape.h" #include "SDL_cocoashape.h"
...@@ -217,6 +218,14 @@ Cocoa_CreateImage(SDL_Surface * surface) ...@@ -217,6 +218,14 @@ Cocoa_CreateImage(SDL_Surface * surface)
SDL_assert_state SDL_assert_state
SDL_PromptAssertion_cocoa(const SDL_assert_data *data) 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]; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSString *msg = [NSString stringWithFormat: NSString *msg = [NSString stringWithFormat:
...@@ -242,6 +251,11 @@ SDL_PromptAssertion_cocoa(const SDL_assert_data *data) ...@@ -242,6 +251,11 @@ SDL_PromptAssertion_cocoa(const SDL_assert_data *data)
[alert addButtonWithTitle:@"Always Ignore"]; [alert addButtonWithTitle:@"Always Ignore"];
const NSInteger clicked = [alert runModal]; const NSInteger clicked = [alert runModal];
[pool release]; [pool release];
if (!initialized) {
SDL_QuitSubSystem(SDL_INIT_VIDEO);
}
return (SDL_assert_state) (clicked - NSAlertFirstButtonReturn); return (SDL_assert_state) (clicked - NSAlertFirstButtonReturn);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment