1 files changed, 2 insertions, 2 deletions
diff --git a/Swift/Controllers/Roster/RosterController.cpp b/Swift/Controllers/Roster/RosterController.cpp
index 6bb5119..ecca9fe 100644
--- a/Swift/Controllers/Roster/RosterController.cpp
+++ b/Swift/Controllers/Roster/RosterController.cpp
@@ -320,70 +320,70 @@ void RosterController::handleIncomingPresence(Presence::ref newPresence) {
 }
 
 void RosterController::handleSubscriptionRequest(const JID& jid, const std::string& message) {
 	if (xmppRoster_->containsJID(jid) && (xmppRoster_->getSubscriptionStateForJID(jid) == RosterItemPayload::To || xmppRoster_->getSubscriptionStateForJID(jid) == RosterItemPayload::Both)) {
 		subscriptionManager_->confirmSubscription(jid);
 		return;
 	}
 	SubscriptionRequestEvent* eventPointer = new SubscriptionRequestEvent(jid, message);
 	eventPointer->onAccept.connect(boost::bind(&RosterController::handleSubscriptionRequestAccepted, this, eventPointer));
 	eventPointer->onDecline.connect(boost::bind(&RosterController::handleSubscriptionRequestDeclined, this, eventPointer));
 	boost::shared_ptr<StanzaEvent> event(eventPointer);
 	eventController_->handleIncomingEvent(event);
 }
 
 void RosterController::handleSubscriptionRequestAccepted(SubscriptionRequestEvent* event) {
 	subscriptionManager_->confirmSubscription(event->getJID());
 	if (!xmppRoster_->containsJID(event->getJID()) || xmppRoster_->getSubscriptionStateForJID(event->getJID()) == RosterItemPayload::None || xmppRoster_->getSubscriptionStateForJID(event->getJID()) == RosterItemPayload::From) {
 		subscriptionManager_->requestSubscription(event->getJID());
 	}
 }
 
 void RosterController::handleSubscriptionRequestDeclined(SubscriptionRequestEvent* event) {
 	subscriptionManager_->cancelSubscription(event->getJID());
 }
 
 void RosterController::handleOwnVCardChanged(VCard::ref vcard) {
 	ownContact_->setVCard(vcard);
 	mainWindow_->setMyContactRosterItem(ownContact_);
 }
 
 void RosterController::handleAvatarChanged(const JID& jid) {
 	boost::filesystem::path path = avatarManager_->getAvatarPath(jid);
 	roster_->applyOnItems(SetAvatar(jid, path));
 	if (jid.equals(myJID_, JID::WithResource)) {
 		mainWindow_->setMyAvatarPath(pathToString(path));
+		ownContact_->setAvatarPath(pathToString(path));
+		mainWindow_->setMyContactRosterItem(ownContact_);
 	}
-	ownContact_->setAvatarPath(pathToString(path));
-	mainWindow_->setMyContactRosterItem(ownContact_);
 }
 
 void RosterController::handlePresenceChanged(Presence::ref presence) {
 	if (presence->getFrom().equals(myJID_, JID::WithResource)) {
 		ownContact_->applyPresence(std::string(), presence);
 		mainWindow_->setMyContactRosterItem(ownContact_);
 	}
 }
 
 boost::optional<XMPPRosterItem> RosterController::getItem(const JID& jid) const {
 	return xmppRoster_->getItem(jid);
 }
 
 std::set<std::string> RosterController::getGroups() const {
 	return xmppRoster_->getGroups();
 }
 
 void RosterController::handleOnCapsChanged(const JID& jid) {
 	DiscoInfo::ref info = entityCapsManager_->getCaps(jid);
 	if (info) {
 		std::set<ContactRosterItem::Feature> features;
 		if (FileTransferManager::isSupportedBy(info)) {
 			features.insert(ContactRosterItem::FileTransferFeature);
 		}
 		if (info->hasFeature(DiscoInfo::WhiteboardFeature)) {
 			features.insert(ContactRosterItem::WhiteboardFeature);
 		}
 		roster_->applyOnItems(SetAvailableFeatures(jid, features));
 	}
 }
 
 }