From 04824abac6f30403eaf934b11bee32c59c57ca79 Mon Sep 17 00:00:00 2001 From: truelight Date: Fri, 10 Aug 2007 13:33:04 +0000 Subject: [PATCH] (svn r10839) -Fix [FS#873]: bring up the assert window for OSX even when there isn't a video-driver loaded (PinguTux) --- src/video/cocoa_v.mm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/video/cocoa_v.mm b/src/video/cocoa_v.mm index de5cbb4945..d4df1de05c 100644 --- a/src/video/cocoa_v.mm +++ b/src/video/cocoa_v.mm @@ -2064,14 +2064,16 @@ void CocoaDialog(const char* title, const char* message, const char* buttonLabel _cocoa_video_dialog = true; wasstarted = _cocoa_video_started; - if (!_cocoa_video_started && _video_driver->Start(NULL) != NULL) { + if (_video_driver == NULL) { + setupApplication(); // Setup application before showing dialog + } else if (!_cocoa_video_started && _video_driver->Start(NULL) != NULL) { fprintf(stderr, "%s: %s\n", title, message); return; } NSRunAlertPanel([NSString stringWithCString: title], [NSString stringWithCString: message], [NSString stringWithCString: buttonLabel], nil, nil); - if (!wasstarted) _video_driver->Stop(); + if (!wasstarted && _video_driver != NULL) _video_driver->Stop(); _cocoa_video_dialog = false; }