1 files changed, 7 insertions, 2 deletions
diff --git a/Swift/Controllers/Chat/MUCController.cpp b/Swift/Controllers/Chat/MUCController.cpp
index 5788465..c9936c0 100644
--- a/Swift/Controllers/Chat/MUCController.cpp
+++ b/Swift/Controllers/Chat/MUCController.cpp
@@ -133,11 +133,14 @@ MUCController::MUCController (
        muc_->onConfigurationFormReceived.connect(boost::bind(&MUCController::handleConfigurationFormReceived, this, _1));
        highlighter_->setMode(isImpromptu_ ? Highlighter::ChatMode : Highlighter::MUCMode);
        highlighter_->setNick(nick_);
-        if (timerFactory) {
+        if (timerFactory && stanzaChannel_->isAvailable()) {
                loginCheckTimer_ = boost::shared_ptr<Timer>(timerFactory->createTimer(MUC_JOIN_WARNING_TIMEOUT_MILLISECONDS));
                loginCheckTimer_->onTick.connect(boost::bind(&MUCController::handleJoinTimeoutTick, this));
                loginCheckTimer_->start();
        }
+        else {
+                chatWindow_->addSystemMessage(chatMessageParser_->parseMessageBody(QT_TRANSLATE_NOOP("", "You are currently offline. You will enter this room when you are connected.")), ChatWindow::DefaultDirection);
+        }
        if (isImpromptu) {
                muc_->onUnlocked.connect(boost::bind(&MUCController::handleRoomUnlocked, this));
                chatWindow_->convertToMUC(ChatWindow::ImpromptuMUC);
@@ -147,7 +150,9 @@ MUCController::MUCController (
                chatWindow_->convertToMUC(ChatWindow::StandardMUC);
                chatWindow_->setName(muc->getJID().getNode());
        }
-        setOnline(true);
+        if (stanzaChannel->isAvailable()) {
+                setOnline(true);
+        }
        if (avatarManager_ != NULL) {
                avatarChangedConnection_ = (avatarManager_->onAvatarChanged.connect(boost::bind(&MUCController::handleAvatarChanged, this, _1)));
        }