History

Merge pull request #1775 from ada-tv/fix/less-intrusive-script-load-error

Make "failed to load script" message less intrusive

ksuprynowicz committed 9 months ago

Commit 96177a52 parents 0e71fbd 19f065f2 files · +7 −1Browse files

Showing the changes to libraries/script-engine/src/ScriptManager.cpp (1 of 2 files). Show all

Unified · Split

libraries/script-engine/src/ScriptManager.cpp+5−0
@@ -594,6 +594,11 @@ void ScriptManager::loadURL(const QUrl& scriptURL, bool reload) { · 593 unmodified lines
594 if (!success) {594 if (!success) {
595 scriptErrorMessage("ERROR Loading file (" + status + "):" + url, url, -1);595 scriptErrorMessage("ERROR Loading file (" + status + "):" + url, url, -1);
596 emit errorLoadingScript(_fileNameString);596 emit errorLoadingScript(_fileNameString);
597
598 // emitting scriptLoaded will keep Interface from discarding
599 // scripts that might only be temporarily unavailable
600 emit scriptLoaded(url);
601
597 return;602 return;
598 }603 }
599 604