From a8a3cc2ba4392f7b4f6c31dc60109cdd174e8827 Mon Sep 17 00:00:00 2001
From: Kevin Smith <git@kismith.co.uk>
Date: Sat, 15 Sep 2012 11:25:49 +0100
Subject: Use last activity for requesting history again in MUCs without
 experimental


diff --git a/Swift/Controllers/Chat/MUCController.cpp b/Swift/Controllers/Chat/MUCController.cpp
index 6a8cbcf..50eee68 100644
--- a/Swift/Controllers/Chat/MUCController.cpp
+++ b/Swift/Controllers/Chat/MUCController.cpp
@@ -199,10 +199,13 @@ void MUCController::rejoin() {
 		if (lastActivity_ == boost::posix_time::not_a_date_time && historyController_) {
 			lastActivity_ = historyController_->getLastTimeStampFromMUC(selfJID_, toJID_);
 		}
-		muc_->joinWithContextSince(nick_, lastActivity_);
-#else
-		muc_->joinAs(nick_);
 #endif
+		if (lastActivity_ == boost::posix_time::not_a_date_time) {
+			muc_->joinAs(nick_);
+		}
+		else {
+			muc_->joinWithContextSince(nick_, lastActivity_);
+		}
 	}
 }
 
-- 
cgit v0.10.2-6-g49f6