Skip to content

Commit 7415f44

Browse files
committed
repo: fix a new crash
1 parent 60e7b2b commit 7415f44

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

source/lua.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ bool Lua::PushHook(const char* hook)
1212
{
1313
if ( !g_Lua )
1414
{
15-
Warning("HolyLib: Lua::PushHook was while g_Lua was NULL! (%s)\n", hook);
15+
Warning("HolyLib: Lua::PushHook was called while g_Lua was NULL! (%s)\n", hook);
1616
return false;
1717
}
1818

source/modules/gameserver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1640,7 +1640,7 @@ void GameServer_OnClientDisconnect(CBaseClient* pClient)
16401640
if (pClient->GetServer() != Util::server)
16411641
return;
16421642

1643-
if (Lua::PushHook("HolyLib:OnClientDisconnect"))
1643+
if (g_Lua && Lua::PushHook("HolyLib:OnClientDisconnect"))
16441644
{
16451645
Push_CBaseClient(pClient);
16461646
g_Lua->CallFunctionProtected(2, 0, true);

source/modules/sourcetv.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ static void hook_CSteam3Server_NotifyClientDisconnect(void* pServer, CBaseClient
8989

9090
if (((CHLTVServer*)pClient->GetServer()) == hltv)
9191
{
92-
if (Lua::PushHook("HolyLib:OnSourceTVClientDisconnect"))
92+
if (g_Lua && Lua::PushHook("HolyLib:OnSourceTVClientDisconnect"))
9393
{
9494
Push_CHLTVClient((CHLTVClient*)pClient);
9595
g_Lua->CallFunctionProtected(2, 0, true);

source/util.h

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,16 +186,21 @@ struct LuaUserData {
186186

187187
if (iReference != -1)
188188
{
189-
g_Lua->ReferencePush(iReference);
190-
g_Lua->SetUserType(-1, NULL);
191-
g_Lua->Pop(1);
192-
g_Lua->ReferenceFree(iReference);
189+
if (g_Lua)
190+
{
191+
g_Lua->ReferencePush(iReference);
192+
g_Lua->SetUserType(-1, NULL);
193+
g_Lua->Pop(1);
194+
g_Lua->ReferenceFree(iReference);
195+
}
193196
iReference = -1;
194197
}
195198

196199
if (iTableReference != -1)
197200
{
198-
g_Lua->ReferenceFree(iTableReference);
201+
if (g_Lua)
202+
g_Lua->ReferenceFree(iTableReference);
203+
199204
iTableReference = -1;
200205
}
201206

0 commit comments

Comments
 (0)