Skip to content

GUI: Prevent crashes when slider thumb button is missing #56

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
x64-dev merged 1 commit into from
Oct 10, 2025
Merged

GUI: Prevent crashes when slider thumb button is missing #56

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,12 @@ static void adjustDisplay( GameWindow *window, Int adjustment,
}

child = list->slider->winGetChild();
if( child == NULL )
{
// Slider thumb button is missing - cannot adjust display properly
DEBUG_LOG(( "adjustDisplay: slider child is NULL, skipping slider adjustment" ));
return;
}
child->winGetSize( &sliderChildSize.x, &sliderChildSize.y );
sData->numTicks = (float)((sliderSize.y - sliderChildSize.y) / (float)sData->maxVal);

Expand Down
9 changes: 9 additions & 0 deletions Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2349,6 +2349,15 @@ GameWindow *GameWindowManager::gogoGadgetSlider( GameWindow *parent,
button = gogoGadgetPushButton( slider, statusFlags, 0, 0,
width, width+1, &buttonInstData, NULL, TRUE );

// Check if button creation failed
if( button == NULL )
{
DEBUG_LOG(( "gogoGadgetSlider error: Failed to create slider thumb button" ));
// Clean up the slider window before returning
winDestroy( slider );
return NULL;
}

// Protect against divide by zero
if( sliderData->maxVal == sliderData->minVal )
sliderData->maxVal = sliderData->minVal + 1;
Expand Down
6 changes: 6 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,12 @@ static void adjustDisplay( GameWindow *window, Int adjustment,
}

child = list->slider->winGetChild();
if( child == NULL )
{
// Slider thumb button is missing - cannot adjust display properly
DEBUG_LOG(( "adjustDisplay: slider child is NULL, skipping slider adjustment" ));
return;
}
child->winGetSize( &sliderChildSize.x, &sliderChildSize.y );
sData->numTicks = (float)((sliderSize.y - sliderChildSize.y) / (float)sData->maxVal);

Expand Down
9 changes: 9 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2352,6 +2352,15 @@ GameWindow *GameWindowManager::gogoGadgetSlider( GameWindow *parent,
button = gogoGadgetPushButton( slider, statusFlags, 0, 0,
width, width+1, &buttonInstData, NULL, TRUE );

// Check if button creation failed
if( button == NULL )
{
DEBUG_LOG(( "gogoGadgetSlider error: Failed to create slider thumb button" ));
// Clean up the slider window before returning
winDestroy( slider );
return NULL;
}

// Protect against divide by zero
if( sliderData->maxVal == sliderData->minVal )
sliderData->maxVal = sliderData->minVal + 1;
Expand Down
Loading