From 88424279c77a6efdb0de636e34f3ebe4c74391da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?=
 <lorenz-dev@lgh-alumni.de>
Date: Mon, 28 Jul 2014 10:02:43 +0100
Subject: [PATCH] Prevent autoconnect from connecting twice

once from the watcher, once from the autoconnect call.
-> remove the autoconnect call, it is not needed
---
 js/glowingbear.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/js/glowingbear.js b/js/glowingbear.js
index 3f442a3..2ce40e8 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -815,6 +815,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
 
     $scope.activeBuffer = models.getActiveBuffer;
 
+    $rootScope.connected = false;
     $rootScope.waseverconnected = false;
 
     $rootScope.models = models;
@@ -898,8 +899,9 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
             document.getElementById('content').setAttribute('sidebar-state', 'hidden');
         }
     };
+    // This also fires on page load
     $scope.$watch('autoconnect', function() {
-        if ($scope.autoconnect && !$rootScope.connected) {
+        if ($scope.autoconnect && !$rootScope.connected && !$rootScope.sslError && !$rootScope.securityError && !$rootScope.errorMessage) {
             $scope.connect();
         }
     });
@@ -1283,10 +1285,6 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         $scope.favico.reset();
     };
 
-    if ($scope.autoconnect && !$rootScope.connected && !$rootScope.sslError && !$rootScope.securityError && !$rootScope.errorMessage) {
-        $scope.connect();
-    }
-
 }]
 );