Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 17:01:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Cleanup and better error handling

Browse source
This commit is contained in:
Liv 2017-05-23 13:54:38 -07:00
parent e9fac38bbb
commit 3340211455
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -428,10 +428,7 @@ QString ScriptEngine::getFilename() const {
bool ScriptEngine::hasValidScriptSuffix(const QString& scriptFileName) { bool ScriptEngine::hasValidScriptSuffix(const QString& scriptFileName) {
QFileInfo fileInfo(scriptFileName); QFileInfo fileInfo(scriptFileName);
QString scriptSuffixToLower = fileInfo.completeSuffix().toLower(); QString scriptSuffixToLower = fileInfo.completeSuffix().toLower();
if (scriptSuffixToLower == "js" || scriptSuffixToLower == "json") { return ((scriptSuffixToLower == "js") || (scriptSuffixToLower == "json"));
return true;
}
return false;
} }
void ScriptEngine::loadURL(const QUrl& scriptURL, bool reload) { void ScriptEngine::loadURL(const QUrl& scriptURL, bool reload) {
@ -443,9 +440,10 @@ void ScriptEngine::loadURL(const QUrl& scriptURL, bool reload) {
_fileNameString = url.toString(); _fileNameString = url.toString();
_isReloading = reload; _isReloading = reload;
// Check that script is an actual script // Check that script has a supported file extension
if (!hasValidScriptSuffix(_fileNameString)) { 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; return;
} }