mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-13 15:31:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix error in Dictionary construction for ScreenSpaceRenderable

Browse Source 
Do not access the std::future for cases where a download is not necessary
This commit is contained in:
Alexander Bock
2016-07-03 14:34:17 +02:00
parent e40d393824
commit 20d0fb8474
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/scripting/scriptengine.cpp
View File

@@ -644,8 +644,7 @@ void ScriptEngine::deserialize(SyncBuffer* syncBuffer){
}
}
void ScriptEngine::postSynchronizationPreDraw(){
void ScriptEngine::postSynchronizationPreDraw() {
std::vector<std::string> scripts;
_mutex.lock();
@@ -653,14 +652,20 @@ void ScriptEngine::postSynchronizationPreDraw(){
_receivedScripts.clear();
_mutex.unlock();
while (!scripts.empty()){
runScript(scripts.back());
scripts.pop_back();
while (!scripts.empty()) {
try {
const std::string& script = scripts.back();
scripts.pop_back();
runScript(script);
}
catch (const ghoul::RuntimeError& e) {
LERRORC(e.component, e.message);
}
}
}
void ScriptEngine::preSynchronization(){
void ScriptEngine::preSynchronization() {
_mutex.lock();