Showing the changes to assignment-client/src/scripts/EntityScriptServer.cpp (1 of 18 files). Show all
Unified · Split
| @@ -415,8 +415,7 @@ void EntityScriptServer::selectAudioFormat(const QString& selectedCodecName) { · 414 unmodified lines | ||
| 415 | 415 | |
| 416 | 416 | void EntityScriptServer::resetEntitiesScriptEngine() { |
| 417 | 417 | auto engineName = QString("about:Entities %1").arg(++_entitiesScriptEngineCount); |
| 418 | − auto newEngine = QSharedPointer<ScriptEngine>(new ScriptEngine(ScriptEngine::ENTITY_SERVER_SCRIPT, NO_SCRIPT, engineName), | |
| 419 | − &ScriptEngine::deleteLater); | |
| 418 | + auto newEngine = scriptEngineFactory(ScriptEngine::ENTITY_SERVER_SCRIPT, NO_SCRIPT, engineName); | |
| 420 | 419 | |
| 421 | 420 | auto webSocketServerConstructorValue = newEngine->newFunction(WebSocketServerClass::constructor); |
| 422 | 421 | newEngine->globalObject().setProperty("WebSocketServer", webSocketServerConstructorValue); |
| @@ -437,11 +436,14 @@ void EntityScriptServer::resetEntitiesScriptEngine() { · 14 unmodified lines | ||
| 437 | 436 | |
| 438 | 437 | |
| 439 | 438 | newEngine->runInThread(); |
| 440 | − DependencyManager::get<EntityScriptingInterface>()->setEntitiesScriptEngine(newEngine.data()); | |
| 439 | + auto newEngineSP = qSharedPointerCast<EntitiesScriptEngineProvider>(newEngine); | |
| 440 | + DependencyManager::get<EntityScriptingInterface>()->setEntitiesScriptEngine(newEngineSP); | |
| 441 | 441 | |
| 442 | − disconnect(_entitiesScriptEngine.data(), &ScriptEngine::entityScriptDetailsUpdated, this, &EntityScriptServer::updateEntityPPS); | |
| 442 | + disconnect(_entitiesScriptEngine.data(), &ScriptEngine::entityScriptDetailsUpdated, | |
| 443 | + this, &EntityScriptServer::updateEntityPPS); | |
| 443 | 444 | _entitiesScriptEngine.swap(newEngine); |
| 444 | − connect(_entitiesScriptEngine.data(), &ScriptEngine::entityScriptDetailsUpdated, this, &EntityScriptServer::updateEntityPPS); | |
| 445 | + connect(_entitiesScriptEngine.data(), &ScriptEngine::entityScriptDetailsUpdated, | |
| 446 | + this, &EntityScriptServer::updateEntityPPS); | |
| 445 | 447 | } |
| 446 | 448 | |
| 447 | 449 | |