(svn r25751) -Fix (r25657): [OSX] Restore fullscreen state also when starting on 10.7+.

This commit is contained in:
michi_cc 2013-08-31 20:17:29 +00:00
parent 137bd4576e
commit f36396929a
1 changed files with 2 additions and 8 deletions

View File

@ -321,18 +321,12 @@ static CocoaSubdriver *QZ_CreateSubdriver(int width, int height, int bpp, bool f
/* OSX 10.7 allows to toggle fullscreen mode differently */
if (MacOSVersionIsAtLeast(10, 7, 0)) {
ret = QZ_CreateWindowSubdriver(width, height, bpp);
if (ret != NULL && fullscreen) ret->ToggleFullscreen();
} else {
ret = fullscreen ? QZ_CreateFullscreenSubdriver(width, height, bpp) : QZ_CreateWindowSubdriver(width, height, bpp);
}
if (ret != NULL) {
/* We cannot set any fullscreen mode on OSX 10.7 when not compiled against SDK 10.7 */
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
if (fullscreen) { ret->ToggleFullscreen(); }
#endif
return ret;
}
if (ret != NULL) return ret;
if (!fallback) return NULL;
/* Try again in 640x480 windowed */