summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2018-06-05 09:24:50 -0400
committerPliable Pixels <pliablepixels@gmail.com>2018-06-05 09:24:50 -0400
commitd981b403912ffe131fdd311c1109ffce012682f4 (patch)
tree8183bc1d125f49222de5026fd4496c9e383aea5c
parentee729b9fb44f2c637c962cfa158f183d7b528613 (diff)
#641 handle resume authSession clearing
-rw-r--r--www/js/MontageCtrl.js2
-rwxr-xr-xwww/js/app.js3
2 files changed, 3 insertions, 2 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index de2bf8ac..2a8be064 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -1711,7 +1711,7 @@ angular.module('zmApp.controllers')
var stream;
if (currentStreamState == streamState.STOPPED || monitor.Monitor.listDisplay == 'noshow' || $rootScope.authSession == 'undefined') {
- // console.log ("STREAM=empty");
+ //console.log ("STREAM=empty and auth="+$rootScope.authSession);
return "";
}
diff --git a/www/js/app.js b/www/js/app.js
index 04f05987..2343b72b 100755
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -1006,7 +1006,8 @@ angular.module('zmApp', [
// This is a good time to check if auth is used :-p
if (!ld.isUseAuth) {
- NVRDataModel.log("Auth is disabled!");
+ NVRDataModel.log("Auth is disabled, setting authSession to ''");
+ $rootScope.authSession='';
d.resolve("Login Success");
$rootScope.$broadcast('auth-success', 'no auth');