Merge remote-tracking branch 'github/master' into portable

debomatic-webui/lib/client.js

@@ -165,7 +165,7 @@ function Client(socket) {
 
         // on client disconnection close all watchers
         socket.on('disconnect', function () {
-            socket.get('watchers', function (err, socket_watchers) {
+            var socket_watchers = socket.watchers;
             if (!socket_watchers)
                 return;
             for (var key in socket_watchers) {
@@ -174,8 +174,6 @@ function Client(socket) {
                 } catch (error_watch) {}
             }
         });
-        });
-
     };
 
     this.send_status = function (status) {