mirror of
https://github.com/lubosz/overte.git
synced 2025-04-27 11:55:25 +02:00
Emit finished signal from AC derived classes
To avoid Agent destruction-in-use move emit finished from setFinished to Agent methods. For other ACs emit from aboutToFinish().
This commit is contained in:
parent
ac43c40d73
commit
1c23fc75a4
6 changed files with 8 additions and 3 deletions
assignment-client/src
libraries/networking/src
|
@ -335,6 +335,7 @@ void Agent::scriptRequestFinished() {
|
|||
}
|
||||
|
||||
setFinished(true);
|
||||
emit finished();
|
||||
}
|
||||
|
||||
request->deleteLater();
|
||||
|
@ -839,6 +840,7 @@ void Agent::aboutToFinish() {
|
|||
|
||||
// destroy all other created dependencies
|
||||
DependencyManager::destroy<ScriptCache>();
|
||||
DependencyManager::destroy<ScriptEngines>();
|
||||
|
||||
DependencyManager::destroy<ResourceCacheSharedItems>();
|
||||
DependencyManager::destroy<SoundCache>();
|
||||
|
|
|
@ -342,6 +342,7 @@ void AssetServer::aboutToFinish() {
|
|||
while (_pendingBakes.size() > 0) {
|
||||
QCoreApplication::processEvents();
|
||||
}
|
||||
emit finished();
|
||||
}
|
||||
|
||||
void AssetServer::run() {
|
||||
|
|
|
@ -72,6 +72,8 @@ void EntityServer::aboutToFinish() {
|
|||
DependencyManager::get<ResourceManager>()->cleanup();
|
||||
|
||||
OctreeServer::aboutToFinish();
|
||||
|
||||
emit finished();
|
||||
}
|
||||
|
||||
void EntityServer::handleEntityPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {
|
||||
|
|
|
@ -582,4 +582,6 @@ void EntityScriptServer::aboutToFinish() {
|
|||
_codec->releaseEncoder(_encoder);
|
||||
_encoder = nullptr;
|
||||
}
|
||||
|
||||
emit finished();
|
||||
}
|
||||
|
|
|
@ -66,8 +66,6 @@ void ThreadedAssignment::setFinished(bool isFinished) {
|
|||
|
||||
// call our virtual aboutToFinish method - this gives the ThreadedAssignment subclass a chance to cleanup
|
||||
aboutToFinish();
|
||||
|
||||
//emit finished();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -25,7 +25,7 @@ public:
|
|||
~ThreadedAssignment() { stop(); }
|
||||
|
||||
void setFinished(bool isFinished);
|
||||
virtual void aboutToFinish() { };
|
||||
virtual void aboutToFinish() { emit finished(); };
|
||||
void addPacketStatsAndSendStatsPacket(QJsonObject statsObject);
|
||||
|
||||
public slots:
|
||||
|
|
Loading…
Reference in a new issue