diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-04-06 13:48:15 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-04-06 13:48:15 -0400 |
| commit | 9ce47c606728896a02d1975c20b5230362d8f62b (patch) | |
| tree | 01a889f22f2316c8fd1db6da6454ca4ac5339d2f | |
| parent | 0c4711ed5c1af400e16c5286e899717ec7add866 (diff) | |
#604 initial checks
| -rw-r--r-- | www/js/EventServer.js | 12 | ||||
| -rw-r--r-- | www/js/MonitorModalCtrl.js | 1 |
2 files changed, 8 insertions, 5 deletions
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'); diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js index 294dbc2f..4351ce1a 100644 --- a/www/js/MonitorModalCtrl.js +++ b/www/js/MonitorModalCtrl.js @@ -297,6 +297,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ function onResume() { + if (1) return; // Do we really need this as it should go to Portal Login NVRDataModel.debug("ModalCtrl: Modal resume called"); if ($scope.isModalActive) { |