From 4e341f156b05fafbaed9584bff8aecd2f2d54f15 Mon Sep 17 00:00:00 2001 From: EladNLG Date: Wed, 19 Apr 2023 02:28:07 +0300 Subject: Fix DecodeJSON fatalParseErrors param (#443) Previously, DecodeJSON would log a warning and swallow the error silently, even if the second argument (fatalParseErrors) was true (default is false). --- NorthstarDLL/scripts/scriptjson.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/NorthstarDLL/scripts/scriptjson.cpp b/NorthstarDLL/scripts/scriptjson.cpp index 98cb52d6..06bda6f4 100644 --- a/NorthstarDLL/scripts/scriptjson.cpp +++ b/NorthstarDLL/scripts/scriptjson.cpp @@ -212,10 +212,12 @@ ADD_SQFUNC( doc.GetErrorOffset()); if (bFatalParseErrors) + { g_pSquirrel->raiseerror(sqvm, sErrorString.c_str()); - else - spdlog::warn(sErrorString); + return SQRESULT_ERROR; + } + spdlog::warn(sErrorString); return SQRESULT_NOTNULL; } -- cgit v1.2.3