Skip to content

Fix img crash when game shutting down #4551

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 6 commits into from
Nov 23, 2025
+10 −0
Merged

Fix img crash when game shutting down #4551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eca89c1
Fix crash when game is shutting down
Xenius97 Nov 17, 2025
72823a9
Add shutdown flag to prevent streaming during client shutdown
Xenius97 Nov 17, 2025
fc244f6
Merge branch 'master' into fix/img_crash
Xenius97 Nov 20, 2025
ad6ce4a
Merge branch 'master' into fix/img_crash
Xenius97 Nov 22, 2025
72d3bae
Prevent unnecessary operations during game shutdown in RestreamWorld …
Xenius97 Nov 22, 2025
b4aba04
Clarify shutdown condition in RestreamWorld function comment
Xenius97 Nov 22, 2025
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
4 changes: 4 additions & 0 deletions Client/mods/deathmatch/CClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ CGame* g_pGame = NULL;
CMultiplayer* g_pMultiplayer = NULL;
CNet* g_pNet = NULL;
CClientGame* g_pClientGame = NULL;
bool g_bClientShuttingDown = false;

int CClient::ClientInitialize(const char* szArguments, CCoreInterface* pCore)
{
Expand Down Expand Up @@ -183,6 +184,9 @@ int CClient::ClientInitialize(const char* szArguments, CCoreInterface* pCore)

void CClient::ClientShutdown()
{
// Global shutdown flag
g_bClientShuttingDown = true;

// Unbind our radio controls
g_pCore->GetKeyBinds()->RemoveControlFunction("radio_next", CClientGame::HandleRadioNext);
g_pCore->GetKeyBinds()->RemoveControlFunction("radio_previous", CClientGame::HandleRadioPrevious);
Expand Down
2 changes: 2 additions & 0 deletions Client/mods/deathmatch/CClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

#include <core/CClientBase.h>

extern bool g_bClientShuttingDown;

class CClient : public CClientBase
{
public:
Expand Down
4 changes: 4 additions & 0 deletions Client/mods/deathmatch/logic/CClientGame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6851,6 +6851,10 @@ bool CClientGame::RestreamModel(std::uint16_t model)

void CClientGame::RestreamWorld()
{
// If game is shutting down, do nothing for avoid crashes
if (g_bClientShuttingDown)
return;

unsigned int numberOfFileIDs = g_pGame->GetCountOfAllFileIDs();

for (unsigned int uiModelID = 0; uiModelID < numberOfFileIDs; uiModelID++)
Expand Down