Skip to content

GameClient: Move m_drawableTOC.clear() to the beginning of the destructor #107

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

Open
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −6
Open

GameClient: Move m_drawableTOC.clear() to the beginning of the destructor #107

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
7 changes: 4 additions & 3 deletions Generals/Code/GameEngine/Source/GameClient/GameClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,10 @@ GameClient::GameClient()
//-------------------------------------------------------------------------------------------------
GameClient::~GameClient()
{
// clear any drawable TOC we might have - do this FIRST to ensure AsciiStrings
// are destroyed while the memory allocator is still in a valid state
m_drawableTOC.clear();

#ifdef PERF_TIMERS
delete TheGraphDraw;
TheGraphDraw = NULL;
Expand All @@ -125,9 +129,6 @@ GameClient::~GameClient()
delete TheDrawGroupInfo;
TheDrawGroupInfo = NULL;

// clear any drawable TOC we might have
m_drawableTOC.clear();

//DEBUG_LOG(("Preloaded texture files ------------------------------------------"));
//for (Int oog=0; oog<preloadTextureNamesGlobalHack2.size(); ++oog)
//{
Expand Down
7 changes: 4 additions & 3 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ GameClient::GameClient()
//-------------------------------------------------------------------------------------------------
GameClient::~GameClient()
{
// clear any drawable TOC we might have - do this FIRST to ensure AsciiStrings
// are destroyed while the memory allocator is still in a valid state
m_drawableTOC.clear();

#ifdef PERF_TIMERS
delete TheGraphDraw;
TheGraphDraw = NULL;
Expand All @@ -137,9 +141,6 @@ GameClient::~GameClient()
delete TheDrawGroupInfo;
TheDrawGroupInfo = NULL;

// clear any drawable TOC we might have
m_drawableTOC.clear();

//DEBUG_LOG(("Preloaded texture files ------------------------------------------"));
//for (Int oog=0; oog<preloadTextureNamesGlobalHack2.size(); ++oog)
//{
Expand Down
Loading