Skip to content

Commit b2e2c3b

Browse files
committed
fix(guiedit): initialize global language after global data to fix initialization dependency
1 parent d61ce1f commit b2e2c3b

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

Generals/Code/Tools/GUIEdit/Source/GUIEdit.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -486,8 +486,6 @@ void GUIEdit::init( void )
486486
TheArchiveFileSystem = new Win32BIGFileSystem;
487487
TheFileSystem->init();
488488

489-
TheGlobalLanguageData = new GlobalLanguage;
490-
TheGlobalLanguageData->init();
491489
//---------------------------------------------------------------------------
492490
// GUI tool specific initializations ----------------------------------------
493491
//---------------------------------------------------------------------------
@@ -510,10 +508,14 @@ void GUIEdit::init( void )
510508
// Game engine specific initializations -------------------------------------
511509
//---------------------------------------------------------------------------
512510

513-
// create the name key generator
511+
// create the global data
514512
TheWritableGlobalData = new GlobalData;
515513
TheWritableGlobalData->init();
516514

515+
// TheSuperHackers @info global language relies on global data being initialized
516+
TheGlobalLanguageData = new GlobalLanguage;
517+
TheGlobalLanguageData->init();
518+
517519
// create the message stream
518520
TheMessageStream = new MessageStream;
519521
TheMessageStream->init();

GeneralsMD/Code/Tools/GUIEdit/Source/GUIEdit.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -486,8 +486,6 @@ void GUIEdit::init( void )
486486
TheArchiveFileSystem = new Win32BIGFileSystem;
487487
TheFileSystem->init();
488488

489-
TheGlobalLanguageData = new GlobalLanguage;
490-
TheGlobalLanguageData->init();
491489
//---------------------------------------------------------------------------
492490
// GUI tool specific initializations ----------------------------------------
493491
//---------------------------------------------------------------------------
@@ -510,10 +508,14 @@ void GUIEdit::init( void )
510508
// Game engine specific initializations -------------------------------------
511509
//---------------------------------------------------------------------------
512510

513-
// create the name key generator
511+
// create the global data
514512
TheWritableGlobalData = new GlobalData;
515513
TheWritableGlobalData->init();
516514

515+
// TheSuperHackers @info global language relies on global data being initialized
516+
TheGlobalLanguageData = new GlobalLanguage;
517+
TheGlobalLanguageData->init();
518+
517519
// create the message stream
518520
TheMessageStream = new MessageStream;
519521
TheMessageStream->init();

0 commit comments

Comments
 (0)