Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-10 21:18:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix AssetClient not properly disconnecting from callbacks

Browse source
This commit is contained in:
Ryan Huffman 2016-04-21 16:37:21 -07:00
parent 63d98b1b5c
commit da5bbe51d1
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libraries/networking/src/AssetClient.cpp
View file

@ -330,19 +330,25 @@ void AssetClient::handleAssetGetReply(QSharedPointer<ReceivedMessage> message, S
if (message->isComplete()) { if (message->isComplete()) {
callbacks.completeCallback(true, error, message->readAll()); callbacks.completeCallback(true, error, message->readAll());
messageCallbackMap.erase(requestIt);
} else { } else {
connect(message.data(), &ReceivedMessage::progress, this, [this, length, message, callbacks]() { connect(message.data(), &ReceivedMessage::progress, this, [this, length, message, &callbacks]() {
callbacks.progressCallback(message->getSize(), length); callbacks.progressCallback(message->getSize(), length);
}); });
connect(message.data(), &ReceivedMessage::completed, this, [this, message, error, callbacks]() { connect(message.data(), &ReceivedMessage::completed, this, [this, messageID, message, &messageCallbackMap, &callbacks]() {
if (message->failed()) { if (message->failed()) {
callbacks.completeCallback(false, AssetServerError::NoError, QByteArray()); callbacks.completeCallback(false, AssetServerError::NoError, QByteArray());
} else { } else {
callbacks.completeCallback(true, error, message->readAll()); callbacks.completeCallback(true, AssetServerError::NoError, message->readAll());
} }
// We should never get to this point without the associated senderNode and messageID
// in our list of pending requests. If the senderNode had disconnected or the message
// had been canceled, we should have been disconnected from the ReceivedMessage
// signals and thus never had this lambda called.
messageCallbackMap.erase(messageID);
}); });
} }
messageCallbackMap.erase(requestIt);
} }
// Although the messageCallbackMap may now be empty, we won't delete the node until we have disconnected from // Although the messageCallbackMap may now be empty, we won't delete the node until we have disconnected from