R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix access violation on script command

Browse Source 
running "script_client" from main menu would cause an access violation when attempting to access m_hVM from the CSquirrelVM instance for the client vm, which has not been created by this point
This commit is contained in:
rexx 2022-06-01 19:57:39 +01:00
parent 6ea1a8bebc
commit 5e58b7a5d3
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
r5dev/squirrel/sqscript.cpp
View File

@ -243,7 +243,15 @@ SQBool Script_LoadScript(HSQUIRRELVM v, const SQChar* szScriptPath, const SQChar
//--------------------------------------------------------------------------------- //---------------------------------------------------------------------------------
void Script_Execute(const SQChar* code, SQCONTEXT context) void Script_Execute(const SQChar* code, SQCONTEXT context)
{ {
HSQUIRRELVM v = Script_GetContextObject(context)->GetVM(); CSquirrelVM* scriptVM = Script_GetContextObject(context);
if (!scriptVM)
{
Error(eDLL_T::ENGINE, "Attempted to run %s script while VM isn't initialized\n", SQVM_GetContextName(context));
return;
}
HSQUIRRELVM v = scriptVM->GetVM();
if (!v) if (!v)
{ {
Error(eDLL_T::ENGINE, "Attempted to run %s script while VM isn't initialized\n", SQVM_GetContextName(context)); Error(eDLL_T::ENGINE, "Attempted to run %s script while VM isn't initialized\n", SQVM_GetContextName(context));