1 files changed, 9 insertions, 1 deletions
diff --git a/Swift/Controllers/Chat/MUCController.cpp b/Swift/Controllers/Chat/MUCController.cpp
index 30e85ad..6d3f9f2 100644
--- a/Swift/Controllers/Chat/MUCController.cpp
+++ b/Swift/Controllers/Chat/MUCController.cpp
@@ -613,45 +613,53 @@ void MUCController::handleConfigurationFailed(ErrorPayload::ref error) {
 	chatWindow_->addErrorMessage(errorMessage);
 }
 
 void MUCController::handleOccupantRoleChangeFailed(ErrorPayload::ref error, const JID&, MUCOccupant::Role) {
 	std::string errorMessage = getErrorMessage(error);
 	errorMessage = str(format(QT_TRANSLATE_NOOP("", "Occupant role change failed: %1%.")) % errorMessage);
 	chatWindow_->addErrorMessage(errorMessage);
 }
 
 void MUCController::handleConfigurationFormReceived(Form::ref form) {
 	chatWindow_->showRoomConfigurationForm(form);
 }
 
 void MUCController::handleConfigurationCancelled() {
 	muc_->cancelConfigureRoom();
 }
 
 void MUCController::handleDestroyRoomRequest() {
 	muc_->destroyRoom();
 }
 
 void MUCController::handleInvitePersonToThisMUCRequest(const JID& jid, const std::string& reason) {
 	muc_->invitePerson(jid, reason);
 }
 
 void MUCController::handleGetAffiliationsRequest() {
 	muc_->requestAffiliationList(MUCOccupant::Owner);
 	muc_->requestAffiliationList(MUCOccupant::Admin);
 	muc_->requestAffiliationList(MUCOccupant::Member);
 	muc_->requestAffiliationList(MUCOccupant::Outcast);
 }
 
 typedef std::pair<MUCOccupant::Affiliation, JID> AffiliationChangePair;
 
 void MUCController::handleChangeAffiliationsRequest(const std::vector<std::pair<MUCOccupant::Affiliation, JID> >& changes) {
+	std::set<JID> addedJIDs;
 	foreach (const AffiliationChangePair& change, changes) {
-		muc_->changeAffiliation(change.second, change.first);
+		if (change.first != MUCOccupant::NoAffiliation) {
+			addedJIDs.insert(change.second);
+		}
+	}
+	foreach (const AffiliationChangePair& change, changes) {
+		if (change.first != MUCOccupant::NoAffiliation || addedJIDs.find(change.second) == addedJIDs.end()) {
+			muc_->changeAffiliation(change.second, change.first);
+		}
 	}
 }
 
 void MUCController::handleAffiliationListReceived(MUCOccupant::Affiliation affiliation, const std::vector<JID>& jids) {
 	chatWindow_->setAffiliations(affiliation, jids);
 }
 
 }