# HG changeset patch # User truelight # Date 1186752784 0 # Node ID d8f97a247304b668ef1d2e5ae27c7a6ef208d6fa # Parent 0bb8f820699668d1aed6998d2d40372b35dcc739 (svn r10839) -Fix [FS#873]: bring up the assert window for OSX even when there isn't a video-driver loaded (PinguTux) diff -r 0bb8f8206996 -r d8f97a247304 src/video/cocoa_v.mm --- a/src/video/cocoa_v.mm Fri Aug 10 13:27:07 2007 +0000 +++ b/src/video/cocoa_v.mm Fri Aug 10 13:33:04 2007 +0000 @@ -2064,14 +2064,16 @@ _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; }