Fixed an issue where toolbar buttons duplicated themselves when reloading scripts
Showing the changes to libraries/script-engine/src/ScriptEngines.cpp (1 of 3 files). Show all
Unified · Split
| @@ -356,6 +356,13 @@ QStringList ScriptEngines::getRunningScripts() { · 355 unmodified lines | ||
| 356 | 356 | void ScriptEngines::stopAllScripts(bool restart) { |
| 357 | 357 | QVector<QString> toReload; |
| 358 | 358 | QReadLocker lock(&_scriptEnginesHashLock); |
| 359 | + | |
| 360 | + if (_isReloading) { | |
| 361 | + return; | |
| 362 | + } else { | |
| 363 | + _isReloading = true; | |
| 364 | + } | |
| 365 | + | |
| 359 | 366 | for (QHash<QUrl, ScriptEngine*>::const_iterator it = _scriptEnginesHash.constBegin(); |
| 360 | 367 | it != _scriptEnginesHash.constEnd(); it++) { |
| 361 | 368 | ScriptEngine *scriptEngine = it.value(); |
| @@ -375,7 +382,7 @@ void ScriptEngines::stopAllScripts(bool restart) { · 13 unmodified lines | ||
| 375 | 382 | } |
| 376 | 383 | // wait for engines to stop (ie: providing time for .scriptEnding cleanup handlers to run) before |
| 377 | 384 | // triggering reload of any Client scripts / Entity scripts |
| 378 | − QTimer::singleShot(500, this, [=]() { | |
| 385 | + QTimer::singleShot(1000, this, [=]() { | |
| 379 | 386 | for(const auto &scriptName : toReload) { |
| 380 | 387 | auto scriptEngine = getScriptEngine(scriptName); |
| 381 | 388 | if (scriptEngine && !scriptEngine->isFinished()) { |
| @@ -390,6 +397,7 @@ void ScriptEngines::stopAllScripts(bool restart) { · 8 unmodified lines | ||
| 390 | 397 | qCDebug(scriptengine) << "stopAllScripts -- emitting scriptsReloading"; |
| 391 | 398 | emit scriptsReloading(); |
| 392 | 399 | } |
| 400 | + _isReloading = false; | |
| 393 | 401 | }); |
| 394 | 402 | } |
| 395 | 403 | |