From 311343f481c7223238d96ce1593b9cb62d04ea2d Mon Sep 17 00:00:00 2001 From: pliablepixels Date: Thu, 25 Feb 2016 09:58:14 -0500 Subject: managed code to not call window.stop immediately upon resume as we already call it on pause Former-commit-id: 0662346ff6149596afb7943e3dc5c45e4a08deea --- www/js/DataModel.js | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'www/js/DataModel.js') diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 0e8fe1ec..1b6b5c81 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -19,6 +19,7 @@ angular.module('zmApp.controllers') var zmAppVersion="unknown"; var isBackground = false; + var justResumed = false; var monitorsLoaded = 0; //var montageSize = 3; var monitors = []; @@ -309,6 +310,26 @@ angular.module('zmApp.controllers') { return loginData.forceNetworkStop; }, + + setJustResumed: function (val) + { + justResumed = true; + }, + + stopNetwork: function() + { + if (justResumed) + { + // we don't call stop as we did stop on pause + zmLog ("Not calling window stop as we just resumed"); + justResumed = false; + } + else + { + zmLog ("Calling window.stop()"); + window.stop(); + } + }, isLoggedIn: function () { -- cgit v1.2.3