Merge pull request overte-org#840 from kasenvr/fix/ess-logging-crash

Prevent crash on entity-script-server due to logging interface.
MarkZuckherberg · Oct 26, 2020 · 5c945c1 · 5c945c1
2 parents f1194ee + 4b2c71c
commit 5c945c1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp
@@ -130,7 +130,7 @@ static QScriptValue debugPrint(QScriptContext* context, QScriptEngine* engine) {
     // This message was sent by one of our script engines, let's try to see if we can find the source.
     // Note that the first entry in the backtrace should be "print" and is somewhat useless to us
     AbstractLoggerInterface* loggerInterface = AbstractLoggerInterface::get();
-    if (loggerInterface->showSourceDebugging()) {
+    if (loggerInterface && loggerInterface->showSourceDebugging()) {
         QScriptContext* userContext = context;
         while (userContext && QScriptContextInfo(userContext).functionType() == QScriptContextInfo::NativeFunction) {
             userContext = userContext->parentContext();