1 files changed, 15 insertions, 5 deletions
diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js
index 75448ceb..f7ade984 100644
--- a/www/js/PortalLoginCtrl.js
+++ b/www/js/PortalLoginCtrl.js
@@ -7,16 +7,25 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
 {
 
     var processPush = false;
+    var broadcastHandles = [];
 
-    $scope.$on ('$ionicView.beforeEnter', function() {
+    $scope.$on ('$ionicView.beforeLeave', function() {
         //processPush = false;
        // NVRDataModel.debug ("BeforeEnter in Portal: setting ProcessPush to false");
     });
 
+    $scope.$on ('$ionicView.beforeLeave', function() {
+       NVRDataModel.debug ("Portal: Deregistering broadcast handles");
+       for (var i=0; i < broadcastHandles.length; i++) {
+           //broadcastHandles[i]();
+       }
+       broadcastHandles = [];
+    });
+
     $scope.$on('$ionicView.enter',
         function()
         {
-
+            NVRDataModel.setJustResumed(false);
             
             NVRDataModel.debug("Inside Portal login Enter handler");
             loginData = NVRDataModel.getLogin();
@@ -246,7 +255,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
                                     return;
                                 }*/
                                 // coming here means continue
-                                EventServer.refresh();
+                                //EventServer.init();
 
                                 var statetoGo = $rootScope.lastState ? $rootScope.lastState : 'app.montage';
                                 //NVRDataModel.debug ("logging state transition");
@@ -276,13 +285,14 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
     }
 
 
-    $rootScope.$on("process-push", function () {
+    var pp = $scope.$on("process-push", function () {
         NVRDataModel.debug("*** PROCESS PUSH HANDLER CALLED INSIDE PORTAL LOGIN, setting ProcessPush to true");
         processPush = true;
         evaluateTappedNotification();
 
        
    });
+   broadcastHandles.push(pp);
   
    function evaluateTappedNotification()
       {
@@ -466,7 +476,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
                                     
                                     NVRDataModel.getKeyConfigParams(1);
                                     NVRDataModel.getTimeZone();
-                                    EventServer.refresh();
+                                    EventServer.init();
 
                                     // if push broadcast happens BEFORE this, then no 
                                     // state change will occur here which is good