summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package.json4
-rw-r--r--www/js/DataModel.js4
2 files changed, 4 insertions, 4 deletions
diff --git a/package.json b/package.json
index 1dd678a8..ef12e701 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "zmninjapro",
"description": "Home security mobile app for ZoneMinder",
- "version": "1.3.029",
+ "version":"1.3.029",
"displayName": "zmNinja",
"author": "Pliable Pixels",
"license": "custom see LICENSE.md",
@@ -176,4 +176,4 @@
]
}
}
-} \ No newline at end of file
+}
diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index c558d884..3e5f41c1 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -408,7 +408,7 @@ angular.module('zmApp.controllers')
var as = 'undefined';
- if (!mid && monitors.length > 0) {
+ if (!mid && monitors && monitors.length > 0) {
mid = monitors[0].Monitor.Id;
}
@@ -2145,7 +2145,7 @@ angular.module('zmApp.controllers')
.then(function (data) {
// console.log("HTTP success got " + JSON.stringify(data.monitors));
data = data.data;
- monitors = data.monitors;
+ if (data.monitors) monitors = data.monitors;
if ($rootScope.authSession == 'undefined') {