1 files changed, 17 insertions, 3 deletions
diff --git a/www/js/app.js b/www/js/app.js
index 2343b72b..f5be3d1e 100755
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -1943,8 +1943,7 @@ angular.module('zmApp', [
           $interval.cancel($rootScope.eventQueryInterval);
           $interval.cancel($rootScope.intervalHandle);
           zmAutoLogin.stop();
-          if ($rootScope.zmPopup)
-            $rootScope.zmPopup.close();
+          
 
 
           // NVRDataModel.log("ROOT APP: Stopping network ");
@@ -1960,10 +1959,25 @@ angular.module('zmApp', [
 
           if (ld.exitOnSleep && $rootScope.platformOS == "android") {
             NVRDataModel.log("user exited app");
-            window.stop();
+            navigator.app.exitApp();
+
             //  ionic.Platform.exitApp();
           }
 
+          if (NVRDataModel.getCurrentServerMultiPortSupported() && $rootScope.platformOS == "android" && !NVRDataModel.isMultiPortDisabled()) {
+            NVRDataModel.log ("Multiport is active, killing app to make sure no streams continue in background...");
+            navigator.app.exitApp();
+          } else {
+            NVRDataModel.debug ("Not exiting app because:");
+            NVRDataModel.debug ("getCurrentServerMultiPortSupported:"+NVRDataModel.getCurrentServerMultiPortSupported());
+            NVRDataModel.debug ("platform:"+$rootScope.platformOS);
+            NVRDataModel.debug ("isMultiPortDisabled:"+NVRDataModel.isMultiPortDisabled());
+
+          }
+
+          if ($rootScope.zmPopup)
+            $rootScope.zmPopup.close();
+
         }, false);
 
       }