Merge pull request #2668 from cmgustavo/bug/import-04

Avoid locked wallet error while scanning addresses
This commit is contained in:
Matias Alejo Garcia 2015-04-30 15:57:59 -03:00
commit 880e77ea8a
1 changed files with 12 additions and 4 deletions

View File

@ -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;