summaryrefslogtreecommitdiff
path: root/www/js/MontageHistoryCtrl.js
diff options
context:
space:
mode:
authorpliablepixels <pliablepixels@gmail.com>2016-02-25 09:58:14 -0500
committerpliablepixels <pliablepixels@gmail.com>2016-02-25 09:58:14 -0500
commit311343f481c7223238d96ce1593b9cb62d04ea2d (patch)
tree574c2243ca0cfd00d09dcb3a35290e96f4c1f9d4 /www/js/MontageHistoryCtrl.js
parente635bf9b5d9c9e3c8f5e3607b4b0fe01d32478cf (diff)
managed code to not call window.stop immediately upon resume as we already call it on pause
Former-commit-id: 0662346ff6149596afb7943e3dc5c45e4a08deea
Diffstat (limited to 'www/js/MontageHistoryCtrl.js')
-rw-r--r--www/js/MontageHistoryCtrl.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js
index 0440f4bd..d733e9f7 100644
--- a/www/js/MontageHistoryCtrl.js
+++ b/www/js/MontageHistoryCtrl.js
@@ -90,7 +90,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
return;
}
- window.stop();
+ ZMDataModel.stopNetwork();
var ld = ZMDataModel.getLogin();
$scope.sliderVal.realRate = $scope.sliderVal.rate *100;
@@ -1248,7 +1248,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
}
ZMDataModel.zmLog ("Forcing a window.stop() here");
- window.stop();
+ ZMDataModel.stopNetwork();