From fd5ee3e1a751a7c40fde902b9ba1c21c3e6d1a2d Mon Sep 17 00:00:00 2001 From: Kasen IO Date: Wed, 22 Jan 2020 14:48:15 -0500 Subject: [PATCH] Whitelist toggle now works. --- libraries/script-engine/src/ScriptEngine.cpp | 5 ++--- libraries/script-engine/src/ScriptEngine.h | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index ace379f759..d8f65e0506 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -2370,10 +2370,9 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co safeURLPrefixes += qEnvironmentVariable("EXTRA_WHITELIST").trimmed().split(QRegExp("\\s*,\\s*"), QString::SkipEmptyParts); // ENTITY SCRIPT WHITELIST TOGGLE CHECK + Setting::Handle _whitelistEnabled{"private/whitelistEnabled", false }; bool whitelistEnabled = _whitelistEnabled.get(); - - _whitelistEnabled.set(true); - + if (!whitelistEnabled) { passList = true; } diff --git a/libraries/script-engine/src/ScriptEngine.h b/libraries/script-engine/src/ScriptEngine.h index a00a6999cb..fca652d7ad 100644 --- a/libraries/script-engine/src/ScriptEngine.h +++ b/libraries/script-engine/src/ScriptEngine.h @@ -975,8 +975,6 @@ protected: QWeakPointer _scriptEngines; - Setting::Handle _whitelistEnabled{"private/whitelistEnabled", false }; - }; ScriptEnginePointer scriptEngineFactory(ScriptEngine::Context context,