Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 07:19:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make sure we don't hear back from replies after we've cleared them.

Browse source
This commit is contained in:
Andrzej Kapolka 2013-06-05 10:34:41 -07:00
parent 8a08bfd01d
commit 391b62ed32
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/src/AvatarVoxelSystem.cpp
View file

@ -79,6 +79,7 @@ void AvatarVoxelSystem::loadVoxelsFromURL(const QUrl& url) {
// cancel any current download // cancel any current download
if (_voxelReply != 0) { if (_voxelReply != 0) {
delete _voxelReply; delete _voxelReply;
_voxelReply = 0;
} }
killLocalVoxels(); killLocalVoxels();
@ -196,17 +197,11 @@ void AvatarVoxelSystem::handleVoxelDownloadProgress(qint64 bytesReceived, qint64
return; return;
} }
// XXXBHG - I don't know why this can happen, but when I was testing this, I used a dropbox URL
// and it resulted in a case where the bytesTotal == bytesReceived, but the _voxelReply was NULL
// which needless to say caused crashes below. I've added this quick guard to protect against
// this case, but it probably should be investigated.
if (!_voxelReply) {
return;
}
QByteArray entirety = _voxelReply->readAll(); QByteArray entirety = _voxelReply->readAll();
_voxelReply->disconnect(this);
_voxelReply->deleteLater(); _voxelReply->deleteLater();
_voxelReply = 0; _voxelReply = 0;
_tree->readBitstreamToTree((unsigned char*)entirety.data(), entirety.size(), WANT_COLOR, NO_EXISTS_BITS); _tree->readBitstreamToTree((unsigned char*)entirety.data(), entirety.size(), WANT_COLOR, NO_EXISTS_BITS);
setupNewVoxelsForDrawing(); setupNewVoxelsForDrawing();
} }
@ -214,6 +209,7 @@ void AvatarVoxelSystem::handleVoxelDownloadProgress(qint64 bytesReceived, qint64
void AvatarVoxelSystem::handleVoxelReplyError() { void AvatarVoxelSystem::handleVoxelReplyError() {
printLog("%s\n", _voxelReply->errorString().toAscii().constData()); printLog("%s\n", _voxelReply->errorString().toAscii().constData());
_voxelReply->disconnect(this);
_voxelReply->deleteLater(); _voxelReply->deleteLater();
_voxelReply = 0; _voxelReply = 0;
} }