From d292a9318d8adcfa86b62e8909f8ea13d5816227 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Mon, 13 Apr 2020 08:14:16 -0400
Subject: put some more boundary checks for notifications

---
 www/js/EventServer.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'www/js/EventServer.js')

diff --git a/www/js/EventServer.js b/www/js/EventServer.js
index 2ade604d..20642c1c 100644
--- a/www/js/EventServer.js
+++ b/www/js/EventServer.js
@@ -654,7 +654,7 @@ angular.module('zmApp.controllers')
             return;
           }
 
-          if (data.additionalData.foreground == false) {
+          if (data && data.additionalData && data.additionalData.foreground == false) {
             // This means push notification tap in background
 
             NVR.debug("EventSever: PUSH NOTF >>> " + JSON.stringify(data));
@@ -688,10 +688,13 @@ angular.module('zmApp.controllers')
 
 
               // if Multiple mids, take the first one
-              var mi = mid.indexOf(',');
-              if (mi > 0) {
-                mid = mid.slice(0, mi);
+              if (mid) {
+                var mi = mid.indexOf(',');
+                if (mi > 0) {
+                  mid = mid.slice(0, mi);
+                }
               }
+             
               mid = parseInt(mid);
 
               $rootScope.tappedMid = mid;
-- 
cgit v1.2.3