summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-05-04 18:20:52 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-05-04 18:20:52 (GMT)
commit8c53236875d2ca77f1b463449918458f6b424ab1 (patch)
tree29cbbf0393ee05914f8121abd93d7668c0117253 /Swiften/Avatars/AvatarManager.cpp
parent43cd98f8e44e70cf1a2133a0202e933f41018cbf (diff)
downloadswift-8c53236875d2ca77f1b463449918458f6b424ab1.zip
swift-8c53236875d2ca77f1b463449918458f6b424ab1.tar.bz2
Don't take an avatar from a presence type='error'.
Resolves: #336
Diffstat (limited to 'Swiften/Avatars/AvatarManager.cpp')
-rw-r--r--Swiften/Avatars/AvatarManager.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/Swiften/Avatars/AvatarManager.cpp b/Swiften/Avatars/AvatarManager.cpp
index a5b6b36..3861520 100644
--- a/Swiften/Avatars/AvatarManager.cpp
+++ b/Swiften/Avatars/AvatarManager.cpp
@@ -42,6 +42,9 @@ void AvatarManager::handlePresenceReceived(boost::shared_ptr<Presence> presence)
if (!update) {
return;
}
+ if (presence->getPayload<ErrorPayload>()) {
+ return;
+ }
JID from = getAvatarJID(presence->getFrom());
String& hash = avatarHashes_[from];
if (hash != update->getPhotoHash()) {