History

Keep return script value

Dale Glass committed 4 years ago

Commit 1a4eb3a1 parent 2a394ee2 files · +30 −29Browse 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−5
@@ -297,10 +297,10 @@ ScriptManager::ScriptManager(Context context, const QString& scriptContents, con · 296 unmodified lines
297 }297 }
298 });298 });
299 }299 }
300 300
301 if (!_areMetaTypesInitialized) {301 if (!_areMetaTypesInitialized) {
302 initMetaTypes();302 initMetaTypes();
303 } 303 }
304}304}
305 305
306QString ScriptManager::getTypeAsString() const {306QString ScriptManager::getTypeAsString() const {
@@ -826,9 +826,9 @@ void ScriptManager::run() { · 519 unmodified lines
826 // (because we're a client script)826 // (because we're a client script)
827 hifi::scripting::setLocalAccessSafeThread(true);827 hifi::scripting::setLocalAccessSafeThread(true);
828 }828 }
829 829
830 _engine->enterIsolateOnThisThread();830 _engine->enterIsolateOnThisThread();
831 831
832 auto filenameParts = _fileNameString.split("/");832 auto filenameParts = _fileNameString.split("/");
833 auto name = filenameParts.size() > 0 ? filenameParts[filenameParts.size() - 1] : "unknown";833 auto name = filenameParts.size() > 0 ? filenameParts[filenameParts.size() - 1] : "unknown";
834 PROFILE_SET_THREAD_NAME("Script: " + name);834 PROFILE_SET_THREAD_NAME("Script: " + name);
@@ -848,7 +848,7 @@ void ScriptManager::run() { · 13 unmodified lines
848 848
849 {849 {
850 PROFILE_RANGE(script, _fileNameString);850 PROFILE_RANGE(script, _fileNameString);
851 _engine->evaluate(_scriptContents, _fileNameString);851 _returnValue = _engine->evaluate(_scriptContents, _fileNameString);
852 _engine->maybeEmitUncaughtException(__FUNCTION__);852 _engine->maybeEmitUncaughtException(__FUNCTION__);
853 }853 }
854#ifdef _WIN32854#ifdef _WIN32

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t