Skip to content

fix(guiedit): Fix crash on GuiEdit launch by initializing GlobalLanguage after GlobalData #1576

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
xezon merged 1 commit into from
Sep 15, 2025
Merged

fix(guiedit): Fix crash on GuiEdit launch by initializing GlobalLanguage after GlobalData #1576

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: 5 additions & 3 deletions Generals/Code/Tools/GUIEdit/Source/GUIEdit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,8 +486,6 @@ void GUIEdit::init( void )
TheArchiveFileSystem = new Win32BIGFileSystem;
TheFileSystem->init();

TheGlobalLanguageData = new GlobalLanguage;
TheGlobalLanguageData->init();
//---------------------------------------------------------------------------
// GUI tool specific initializations ----------------------------------------
//---------------------------------------------------------------------------
Expand All @@ -510,10 +508,14 @@ void GUIEdit::init( void )
// Game engine specific initializations -------------------------------------
//---------------------------------------------------------------------------

// create the name key generator
// create the global data
TheWritableGlobalData = new GlobalData;
TheWritableGlobalData->init();

// TheSuperHackers @info global language relies on global data being initialized
TheGlobalLanguageData = new GlobalLanguage;
TheGlobalLanguageData->init();

// create the message stream
TheMessageStream = new MessageStream;
TheMessageStream->init();
Expand Down
8 changes: 5 additions & 3 deletions GeneralsMD/Code/Tools/GUIEdit/Source/GUIEdit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,8 +486,6 @@ void GUIEdit::init( void )
TheArchiveFileSystem = new Win32BIGFileSystem;
TheFileSystem->init();

TheGlobalLanguageData = new GlobalLanguage;
TheGlobalLanguageData->init();
//---------------------------------------------------------------------------
// GUI tool specific initializations ----------------------------------------
//---------------------------------------------------------------------------
Expand All @@ -510,10 +508,14 @@ void GUIEdit::init( void )
// Game engine specific initializations -------------------------------------
//---------------------------------------------------------------------------

// create the name key generator
// create the global data
TheWritableGlobalData = new GlobalData;
TheWritableGlobalData->init();

// TheSuperHackers @info global language relies on global data being initialized
TheGlobalLanguageData = new GlobalLanguage;
TheGlobalLanguageData->init();

// create the message stream
TheMessageStream = new MessageStream;
TheMessageStream->init();
Expand Down
Loading