Merge branch 'fixes'

4 years ago · 17d84c5925
parent 0e833c37ef
commit 17d84c5925
1 changed files with 2 additions and 2 deletions
--- a/ryzom/server/src/ai_service/script_vm.cpp
+++ b/ryzom/server/src/ai_service/script_vm.cpp
@ -870,7 +870,7 @@ void CScriptVM::interpretCode(
 				{
 					otherContext = callerContext;
 				}
-				else
+				else if (thisContext != NULL)
 				{
 					otherContext = thisContext->findContext(strId);
 				}