1 files changed, 9 insertions, 7 deletions
diff --git a/Swiften/Avatars/AvatarManagerImpl.cpp b/Swiften/Avatars/AvatarManagerImpl.cpp
index 7c3baa7..3aaae33 100644
--- a/Swiften/Avatars/AvatarManagerImpl.cpp
+++ b/Swiften/Avatars/AvatarManagerImpl.cpp
@@ -1,64 +1,66 @@
 /*
  * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include <Swiften/Avatars/AvatarManagerImpl.h>
 
 #include <boost/bind.hpp>
 
 #include <Swiften/Avatars/VCardUpdateAvatarManager.h>
 #include <Swiften/Avatars/VCardAvatarManager.h>
 #include <Swiften/Avatars/AvatarStorage.h>
 #include <Swiften/Avatars/OfflineAvatarManager.h>
 #include <Swiften/Base/ByteArray.h>
 
 namespace Swift {
 
 AvatarManagerImpl::AvatarManagerImpl(VCardManager* vcardManager, StanzaChannel* stanzaChannel, AvatarStorage* avatarStorage, CryptoProvider* crypto, MUCRegistry* mucRegistry) : avatarStorage(avatarStorage) {
 	vcardUpdateAvatarManager = new VCardUpdateAvatarManager(vcardManager, stanzaChannel, avatarStorage, crypto, mucRegistry);
 	combinedAvatarProvider.addProvider(vcardUpdateAvatarManager);
 
 	vcardAvatarManager = new VCardAvatarManager(vcardManager, avatarStorage, crypto, mucRegistry);
 	combinedAvatarProvider.addProvider(vcardAvatarManager);
 
 	offlineAvatarManager = new OfflineAvatarManager(avatarStorage);
 	combinedAvatarProvider.addProvider(offlineAvatarManager);
 
 	combinedAvatarProvider.onAvatarChanged.connect(boost::bind(&AvatarManagerImpl::handleCombinedAvatarChanged, this, _1));
 }
 
 AvatarManagerImpl::~AvatarManagerImpl() {
 	combinedAvatarProvider.onAvatarChanged.disconnect(boost::bind(&AvatarManagerImpl::handleCombinedAvatarChanged, this, _1));
 
 	combinedAvatarProvider.removeProvider(offlineAvatarManager);
 	delete offlineAvatarManager;
 	combinedAvatarProvider.removeProvider(vcardAvatarManager);
 	delete vcardAvatarManager;
 	combinedAvatarProvider.removeProvider(vcardUpdateAvatarManager);
 	delete vcardUpdateAvatarManager;
 }
 
 boost::filesystem::path AvatarManagerImpl::getAvatarPath(const JID& jid) const {
-	std::string hash = combinedAvatarProvider.getAvatarHash(jid);
-	if (!hash.empty()) {
-		return avatarStorage->getAvatarPath(hash);
+	boost::optional<std::string> hash = combinedAvatarProvider.getAvatarHash(jid);
+	if (hash && !hash->empty()) {
+		return avatarStorage->getAvatarPath(*hash);
 	}
 	return boost::filesystem::path();
 }
 
 ByteArray AvatarManagerImpl::getAvatar(const JID& jid) const {
-	std::string hash = combinedAvatarProvider.getAvatarHash(jid);
-	if (!hash.empty()) {
-		return avatarStorage->getAvatar(hash);
+	boost::optional<std::string> hash = combinedAvatarProvider.getAvatarHash(jid);
+	if (hash && !hash->empty()) {
+		return avatarStorage->getAvatar(*hash);
 	}
 	return ByteArray();
 }
 
 void AvatarManagerImpl::handleCombinedAvatarChanged(const JID& jid) {
-	offlineAvatarManager->setAvatar(jid, combinedAvatarProvider.getAvatarHash(jid));
+	boost::optional<std::string> hash = combinedAvatarProvider.getAvatarHash(jid);
+	assert(hash);
+	offlineAvatarManager->setAvatar(jid, *hash);
 	onAvatarChanged(jid);
 }
 
 }