Skip to content

Commit 7bf0b4a

Browse files
authored
Merge branch 'master' into fix/explosion-trigger-clientside
2 parents 4c0c418 + 3e6c1a5 commit 7bf0b4a

File tree

5 files changed

+1305
-1296
lines changed

5 files changed

+1305
-1296
lines changed

Server/mods/deathmatch/logic/CGame.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,7 @@ CGame::~CGame()
421421
SAFE_DELETE(m_pASE);
422422
SAFE_RELEASE(m_pHqComms);
423423
CSimControl::Shutdown();
424+
CThreadPool::getDefaultThreadPool().shutdown();
424425

425426
// Clear our global pointer
426427
g_pGame = NULL;

0 commit comments

Comments
 (0)