Skip to content

Fix infinite vid_restart loop from SDL resize events on macOS #106

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
sago007 merged 1 commit into from
Apr 10, 2026
Merged

Fix infinite vid_restart loop from SDL resize events on macOS #106

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
31 changes: 20 additions & 11 deletions code/sdl/sdl_input.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1185,17 +1185,26 @@ static void IN_ProcessEvents( void )
{
case SDL_WINDOWEVENT_RESIZED:
{
char width[32], height[32];
Com_sprintf( width, sizeof( width ), "%d", e.window.data1 );
Com_sprintf( height, sizeof( height ), "%d", e.window.data2 );
Cvar_Set( "r_customwidth", width );
Cvar_Set( "r_customheight", height );
Cvar_Set( "r_mode", "-1" );

// Wait until user stops dragging for 1 second, so
// we aren't constantly recreating the GL context while
// he tries to drag...
vidRestartTime = Sys_Milliseconds( ) + 1000;
int newWidth = e.window.data1;
int newHeight = e.window.data2;

// Ignore spurious resize events fired when the window is
// recreated at the same size (e.g. after vid_restart on macOS).
if( newWidth != Cvar_VariableIntegerValue( "r_customwidth" ) ||
newHeight != Cvar_VariableIntegerValue( "r_customheight" ) )
{
char width[32], height[32];
Com_sprintf( width, sizeof( width ), "%d", newWidth );
Com_sprintf( height, sizeof( height ), "%d", newHeight );
Cvar_Set( "r_customwidth", width );
Cvar_Set( "r_customheight", height );
Cvar_Set( "r_mode", "-1" );

// Wait until user stops dragging for 1 second, so
// we aren't constantly recreating the GL context while
// he tries to drag...
vidRestartTime = Sys_Milliseconds( ) + 1000;
}
}
break;

Expand Down