History

Rename ScriptEngine::wait to match std threading

Zach Pomerantz committed 10 years ago

Commit 2cc788f1 parent edf82c53 files · +8 −5Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+1−2
@@ -284,8 +284,7 @@ void ScriptEngine::runInThread() { · 283 unmodified lines
284 workerThread->start();284 workerThread->start();
285}285}
286 286
287void ScriptEngine::waitTillDoneRunning() {287void ScriptEngine::wait() {
288 // If the script never started running or finished running before we got here, we don't need to wait for it
289 auto workerThread = thread();288 auto workerThread = thread();
290 289
291 if (_isThreaded && workerThread) {290 if (_isThreaded && workerThread) {