From 9ce47c606728896a02d1975c20b5230362d8f62b Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Fri, 6 Apr 2018 13:48:15 -0400
Subject: #604 initial checks

---
 www/js/EventServer.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'www/js/EventServer.js')

diff --git a/www/js/EventServer.js b/www/js/EventServer.js
index 0d439abe..489a96c7 100644
--- a/www/js/EventServer.js
+++ b/www/js/EventServer.js
@@ -315,13 +315,15 @@ angular.module('zmApp.controllers')
 
         function disconnect()
         {
-            NVRDataModel.log("Disconnecting and deleting Event Server socket...");
-
-            if (typeof ws === 'undefined')
+           
+            if (typeof ws === 'undefined') {
+                NVRDataModel.log("Event server socket is empty, nothing to disconnect");
                 return;
-
+            }
+                
+            NVRDataModel.log("Disconnecting and deleting Event Server socket...");
            // ws.$close();
-           ws.close();
+           ws.close(true); // force close
            // ws.$un('open');
            // ws.$un('close');
            // ws.$un('message');
-- 
cgit v1.2.3