From 2dca00fc8be172f6bed7bbd8cc9b46093f978bea Mon Sep 17 00:00:00 2001
From: pliablepixels <pliablepixels@gmail.com>
Date: Fri, 5 Feb 2016 09:51:38 -0500
Subject: #126 and #155 - I think I finally got it this time

Former-commit-id: 85587badc26f74e31a1a458ca3bdb3fff016968f
---
 www/js/app.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

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

diff --git a/www/js/app.js b/www/js/app.js
index d847eac9..77bf4d48 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -686,13 +686,16 @@ angular.module('zmApp', [
                 return (d.promise);
 
             })
-            .error(function (error) {
+            .error(function (error, status) {
                 $ionicLoading.hide();
-                $rootScope.loggedIntoZm = -1;
+                
                 //console.log("**** ZM Login FAILED");
-                ZMDataModel.zmLog("zmAutologin Error " + JSON.stringify(error),
-                    "error, but not calling auth-error emit");
+            
+                // FIXME: Is this sometimes results in null
+                
+                ZMDataModel.zmLog("zmAutologin Error " + JSON.stringify(error) +  " and status " + status);
                 // bad urls etc come here
+                $rootScope.loggedIntoZm = -1;    
                 $rootScope.$emit('auth-error', error);
 
                 d.reject("Login Error");
-- 
cgit v1.2.3