From d28f454b14025f0359f8705f34f8f3dfad6c0217 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 30 Apr 2015 15:58:06 -0300 Subject: [PATCH] Avoid locked wallet error while scanning addresses --- src/js/controllers/walletHome.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index fce0a4332..1a11192ff 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -301,11 +301,19 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi var fc = profileService.focusedClient; self.generatingAddress = true; fc.createAddress(function(err, addr) { + self.generatingAddress = false; if (err) { - $log.debug('Creating address ERROR:', err); - $scope.$emit('Local/ClientError', err); - self.generatingAddress = false; - $scope.$digest(); + if (err.error.match(/locked/gi)) { + $log.debug(err.error); + $timeout(function() { + self.setNewAddress(); + }, 5000); + } + else { + $log.debug('Creating address ERROR:', err); + $scope.$emit('Local/ClientError', err); + $scope.$digest(); + } return; } self.addr = addr.address;