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

Keep return script value

Browse source
This commit is contained in:
Dale Glass 2022-10-13 20:34:32 +02:00 committed by ksuprynowicz
parent 34ab0f10e0
commit e2b140848f
2 changed files with 30 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/script-engine/src/ScriptManager.cpp
View file

@ -848,7 +848,7 @@ void ScriptManager::run() {
{ {
PROFILE_RANGE(script, _fileNameString); PROFILE_RANGE(script, _fileNameString);
_engine->evaluate(_scriptContents, _fileNameString); _returnValue = _engine->evaluate(_scriptContents, _fileNameString);
_engine->maybeEmitUncaughtException(__FUNCTION__); _engine->maybeEmitUncaughtException(__FUNCTION__);
} }
#ifdef _WIN32 #ifdef _WIN32

1
libraries/script-engine/src/ScriptManager.h
View file

@ -968,6 +968,7 @@ protected:
mutable QReadWriteLock _entityScriptsLock { QReadWriteLock::Recursive }; mutable QReadWriteLock _entityScriptsLock { QReadWriteLock::Recursive };
QHash<EntityItemID, EntityScriptDetails> _entityScripts; QHash<EntityItemID, EntityScriptDetails> _entityScripts;
EntityScriptContentAvailableMap _contentAvailableQueue; EntityScriptContentAvailableMap _contentAvailableQueue;
ScriptValue _returnValue;
bool _isThreaded { false }; bool _isThreaded { false };
qint64 _lastUpdate; qint64 _lastUpdate;