From 3340211455fc504d655edb527e4fedcfb6384671 Mon Sep 17 00:00:00 2001 From: Liv Date: Tue, 23 May 2017 13:54:38 -0700 Subject: [PATCH] Cleanup and better error handling --- libraries/script-engine/src/ScriptEngine.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index ffd26cb9fb..2b39e47273 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -428,10 +428,7 @@ QString ScriptEngine::getFilename() const { bool ScriptEngine::hasValidScriptSuffix(const QString& scriptFileName) { QFileInfo fileInfo(scriptFileName); QString scriptSuffixToLower = fileInfo.completeSuffix().toLower(); - if (scriptSuffixToLower == "js" || scriptSuffixToLower == "json") { - return true; - } - return false; + return ((scriptSuffixToLower == "js") || (scriptSuffixToLower == "json")); } void ScriptEngine::loadURL(const QUrl& scriptURL, bool reload) { @@ -443,9 +440,10 @@ void ScriptEngine::loadURL(const QUrl& scriptURL, bool reload) { _fileNameString = url.toString(); _isReloading = reload; - // Check that script is an actual script + // Check that script has a supported file extension if (!hasValidScriptSuffix(_fileNameString)) { - qCDebug(scriptengine) << "File extension of file: " + _fileNameString + " is not a currently supported script type"; + scriptErrorMessage("File extension of file: " + _fileNameString + " is not a currently supported script type"); + emit errorLoadingScript(_fileNameString); return; }