Skip to content

Fix -nosplash on Windows #704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mcarans merged 1 commit into from
Jul 26, 2026
Merged

Fix -nosplash on Windows #704

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions src/SDL/MyOpenGLView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,13 +452,12 @@ - (id) init
#if OOLITE_WINDOWS
ShowWindow(windowHandle,SW_SHOWMINIMIZED);
updateContext = !showSplashScreen;
#elif OOLITE_LINUX
#endif
if (!showSplashScreen)
{
// blank the surface / go to fullscreen
[self initialiseGLWithSize: firstScreen];
}
#endif

[self autoShowMouse];

Expand Down Expand Up @@ -500,12 +499,11 @@ - (void) endSplashScreen

wasFullScreen = !fullScreen;
updateContext = YES;
ShowWindow(windowHandle,SW_RESTORE);
[self initialiseGLWithSize: firstScreen];
#endif // OOLITE_WINDOWS

#else
if (!showSplashScreen) return;
if (!showSplashScreen) return;

#if OOLITE_LINUX
SDL_HideWindow(window);
SDL_SetWindowSize(window, firstScreen.width, firstScreen.height);
SDL_SetWindowPosition(window, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED);
Expand All @@ -528,7 +526,7 @@ - (void) endSplashScreen
*/
}

#endif // OOLITE_WINDOWS
#endif // OOLITE_LINUX

[self updateScreen];
[self autoShowMouse];
Expand Down