Mercurial > hg > openttd
changeset 7434:7e4d40653836 draft
(svn r10839) -Fix [FS#873]: bring up the assert window for OSX even when there isn't a video-driver loaded (PinguTux)
| author | truelight <truelight@openttd.org> |
|---|---|
| date | Fri, 10 Aug 2007 13:33:04 +0000 |
| parents | dd74c3c5a036 |
| children | 1907f293d719 |
| files | src/video/cocoa_v.mm |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/video/cocoa_v.mm +++ b/src/video/cocoa_v.mm @@ -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; }