summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2018-10-29 08:49:29 -0400
committerPliable Pixels <pliablepixels@gmail.com>2018-10-29 08:49:29 -0400
commit583663789aebb45ff2c107857b5021d51c03ea6b (patch)
tree593c84e6e431d258f77910f3f1e330e0ada1b118
parentdc113c2cfae14dbd7f71d160948f6a366cf0c9ba (diff)
#725 alreadyTransitioned at right place
-rw-r--r--config.xml2
-rw-r--r--www/js/PortalLoginCtrl.js1
2 files changed, 2 insertions, 1 deletions
diff --git a/config.xml b/config.xml
index 66a73b8f..a119d5ea 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
-<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.3.028" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.3.029" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>zmNinja</name>
<description>
High performance ZoneMinder client
diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js
index 40dc446e..22bb46f8 100644
--- a/www/js/PortalLoginCtrl.js
+++ b/www/js/PortalLoginCtrl.js
@@ -414,6 +414,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
// NVRDataModel.debug("logging state transition");
if (!processPush) {
+ alreadyTransitioned = true;
NVRDataModel.debug("Transitioning state to: " +
statetoGo + " with param " + JSON.stringify($rootScope.lastStateParam));