From 43f04d429625257745c352b4d79b69ba09088b0b Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 18 Apr 2017 17:19:11 -0300
Subject: [PATCH] fix starting

---
 src/js/controllers/pin.js | 7 ++++++-
 src/js/routes.js          | 3 ---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/js/controllers/pin.js b/src/js/controllers/pin.js
index 9abadb441..3156320fd 100644
--- a/src/js/controllers/pin.js
+++ b/src/js/controllers/pin.js
@@ -175,7 +175,12 @@ angular.module('copayApp.controllers').controller('pinController', function($sta
 
   $scope.close = function(delay) {
     $timeout(function() {
-      $ionicHistory.viewHistory().backView ? $ionicHistory.goBack() : $state.go('tabs.home');
+      var shouldReturn = $ionicHistory.viewHistory().backView && $ionicHistory.viewHistory().backView.stateName != 'starting';
+
+      if (shouldReturn)
+        $ionicHistory.goBack()
+      else
+        $state.go('tabs.home');
     }, delay || 1);
   };
 });
diff --git a/src/js/routes.js b/src/js/routes.js
index 5b03f365f..da09f3a7b 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -1209,12 +1209,10 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
       function checkAndApplyLock(onResume) {
         var defaultView = 'tabs.home';
 
-console.log('[routes.js.1211]'); //TODO
         if (!platformInfo.isCordova && !platformInfo.isDevel) {
           goTo(defaultView);
         }
 
-console.log('[routes.js.1216]'); //TODO
         function goTo(nextView) {
           nextView = nextView || defaultView;
           $state.transitionTo(nextView).then(function() {
@@ -1289,7 +1287,6 @@ console.log('[routes.js.1216]'); //TODO
               historyRoot: true
             });
 
-console.log('[routes.js.1289]'); //TODO
             checkAndApplyLock();
           });
         };