1 files changed, 12 insertions, 2 deletions
diff --git a/Swift/Controllers/Chat/AutoAcceptMUCInviteDecider.h b/Swift/Controllers/Chat/AutoAcceptMUCInviteDecider.h
index 0f85a8a..d6e069f 100644
--- a/Swift/Controllers/Chat/AutoAcceptMUCInviteDecider.h
+++ b/Swift/Controllers/Chat/AutoAcceptMUCInviteDecider.h
@@ -1,31 +1,41 @@
 /*
  * Copyright (c) 2013 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2014 Kevin Smith and Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
 #pragma once
 
 #include <Swiften/Roster/XMPPRoster.h>
 #include <Swiften/Elements/MUCInvitationPayload.h>
 #include <Swift/Controllers/Settings/SettingsProvider.h>
 #include <Swift/Controllers/SettingConstants.h>
 
 namespace Swift {
 	class AutoAcceptMUCInviteDecider {
 		public:
 			AutoAcceptMUCInviteDecider(const JID& domain, XMPPRoster* roster, SettingsProvider* settings) : domain_(domain), roster_(roster), settings_(settings) {
 			}
 
 			bool isAutoAcceptedInvite(const JID& from, MUCInvitationPayload::ref invite) {
-				if (!invite->getIsImpromptu() && !invite->getIsContinuation()) {
-					return false;
+				if (!invite->getIsImpromptu()) {
+					return false; /* always ask the user for normal MUC invites */
+				}
+
+				if (invite->getIsContinuation()) {
+					return true;
 				}
 
 				std::string auto_accept_mode = settings_->getSetting(SettingConstants::INVITE_AUTO_ACCEPT_MODE);
 				if (auto_accept_mode == "no") {
 					return false;
 				} else if (auto_accept_mode == "presence") {
 					return roster_->getSubscriptionStateForJID(from) == RosterItemPayload::From || roster_->getSubscriptionStateForJID(from) == RosterItemPayload::Both;
 				} else if (auto_accept_mode == "domain") {
 					return roster_->getSubscriptionStateForJID(from) == RosterItemPayload::From || roster_->getSubscriptionStateForJID(from) == RosterItemPayload::Both || from.getDomain() == domain_;