Skip to content

fix(options): Fix System Time and Game Time settings not loading and applying correctly #1349

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
merged 1 commit into from
Jul 27, 2025
Merged

fix(options): Fix System Time and Game Time settings not loading and applying correctly #1349

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
8 changes: 4 additions & 4 deletions Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1228,8 +1228,8 @@ static void saveOptions( void )

//-------------------------------------------------------------------------------------------------
// Set System Time Font Size
val = TheWritableGlobalData->m_systemTimeFontSize; // TheSuperHackers @todo replace with options input when applicable
if (val)
val = pref->getSystemTimeFontSize(); // TheSuperHackers @todo replace with options input when applicable
if (val >= 0)
{
AsciiString prefString;
prefString.format("%d", val);
Expand All @@ -1239,8 +1239,8 @@ static void saveOptions( void )

//-------------------------------------------------------------------------------------------------
// Set Game Time Font Size
val = TheWritableGlobalData->m_gameTimeFontSize; // TheSuperHackers @todo replace with options input when applicable
if (val)
val = pref->getGameTimeFontSize(); // TheSuperHackers @todo replace with options input when applicable
if (val >= 0)
{
AsciiString prefString;
prefString.format("%d", val);
Expand Down
8 changes: 4 additions & 4 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1288,8 +1288,8 @@ static void saveOptions( void )

//-------------------------------------------------------------------------------------------------
// Set System Time Font Size
val = TheWritableGlobalData->m_systemTimeFontSize; // TheSuperHackers @todo replace with options input when applicable
if (val)
val = pref->getSystemTimeFontSize(); // TheSuperHackers @todo replace with options input when applicable
if (val >= 0)
{
AsciiString prefString;
prefString.format("%d", val);
Expand All @@ -1299,8 +1299,8 @@ static void saveOptions( void )

//-------------------------------------------------------------------------------------------------
// Set Game Time Font Size
val = TheWritableGlobalData->m_gameTimeFontSize; // TheSuperHackers @todo replace with options input when applicable
if (val)
val = pref->getGameTimeFontSize(); // TheSuperHackers @todo replace with options input when applicable
if (val >= 0)
{
AsciiString prefString;
prefString.format("%d", val);
Expand Down
Loading