From cb288341fb859e2e16b8e8a3e8ef6c8950628c7d Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Tue, 24 May 2016 09:02:04 +0000
Subject: [PATCH] Bugfix. Login form doesn't render after logging out

when auto_reconnect = false
---
 docs/CHANGES.md            | 5 +++++
 src/converse-controlbox.js | 1 +
 src/converse-core.js       | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/CHANGES.md b/docs/CHANGES.md
index d0eb39d6e..9875b8362 100755
--- a/docs/CHANGES.md
+++ b/docs/CHANGES.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.0.2 (Unreleased)
+
+- Bugfix. Login form doesn't render after logging out, when `auto_reconnect = false` 
+  [jcbrand]
+
 ## 1.0.2 (2016-05-24)
 
 - Bugfix. Bind `sendPresence` to the right context. Bug that slipped in during
diff --git a/src/converse-controlbox.js b/src/converse-controlbox.js
index 8650126d4..6ebc04ce9 100644
--- a/src/converse-controlbox.js
+++ b/src/converse-controlbox.js
@@ -57,6 +57,7 @@
                     view.$('#controlbox-tabs').empty();
                     view.renderLoginPanel();
                 }
+                return result;
             },
 
             _tearDown: function () {
diff --git a/src/converse-core.js b/src/converse-core.js
index 83fe7cc13..4acd68f96 100755
--- a/src/converse-core.js
+++ b/src/converse-core.js
@@ -442,7 +442,7 @@
         }, 1000);
 
         this.onDisconnected = function (condition) {
-            if (!converse.auto_reconnect) { return; }
+            if (!converse.auto_reconnect) { return 'disconnected'; }
             if (converse.disconnection_cause === Strophe.Status.CONNFAIL) {
                 converse.reconnect(condition);
                 return 'reconnecting';