broadcast handler cleanups and others

1 files changed, 13 insertions, 1 deletions

diff --git a/www/js/EventsModalGraphCtrl.js b/www/js/EventsModalGraphCtrl.js
index fc9a9c42..65e42b12 100644
--- a/www/js/EventsModalGraphCtrl.js
+++ b/www/js/EventsModalGraphCtrl.js
@@ -20,6 +20,17 @@ angular.module('zmApp.controllers').controller('EventsModalGraphCtrl', ['$scope'
     var current_options;
     var btype;
     var data, options;
+    var broadCastHandles = [];
+
+
+    $scope.$on('modal.removed', function(e, m)
+    {
+        NVRDataModel.debug ("Deregistering broadcast handles");
+        for (var i=0; i < broadcastHandles.length; i++) {
+            broadcastHandles[i]();
+        }
+        broadcastHandles = [];
+    });
 
     $scope.$on('modal.shown', function(e, m)
     {
@@ -104,12 +115,13 @@ angular.module('zmApp.controllers').controller('EventsModalGraphCtrl', ['$scope'
     // we use this to reload the connkey if authkey changed
     //------------------------------------------------------
 
-    $rootScope.$on("auth-success", function()
+    var as = $rootScope.$on("auth-success", function()
     {
 
         NVRDataModel.debug("EventModalCtrl: Re-login detected, resetting everything & re-generating connkey");
 
     });
+    broadCastHandles.push(as);
 
     //-------------------------------------------------------
     // I was kidding, this is where it really is drawn