anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Fix importing partial backup

Browse source
This commit is contained in:
Yemel Jardi 2014-07-08 16:47:00 -03:00
commit 774f9e4def
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/controllers/header.js
View file

@ -89,8 +89,8 @@ angular.module('copayApp.controllers').controller('HeaderController',
$scope.backup = function() { $scope.backup = function() {
var w = $rootScope.wallet; var w = $rootScope.wallet;
backupService.download(w);
w.setBackupReady(); w.setBackupReady();
backupService.download(w);
}; };
$scope.getVideoURL = function(copayer) { $scope.getVideoURL = function(copayer) {

6
js/controllers/import.js
View file

@ -31,6 +31,12 @@ angular.module('copayApp.controllers').controller('ImportController',
return; return;
} }
if (!w.isReady()) {
$rootScope.wallet = w;
controllerUtils.startNetwork($rootScope.wallet, $scope);
return;
}
w.updateIndexes(function(err) { w.updateIndexes(function(err) {
updateStatus('Importing wallet - We are almost there...'); updateStatus('Importing wallet - We are almost there...');
if (err) { if (err) {