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

Merge pull request #2941 from matiu/bug/save-remote-with-recreate

Browse source 
fix save-remote with unregisters wallets
This commit is contained in:
Gustavo Maximiliano Cortez 2015-06-30 18:56:16 -03:00
commit 1b222f3388
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/js/controllers/index.js
View file

@ -161,7 +161,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r
$log.debug('Saving remote preferences', client.credentials.walletName, prefs); $log.debug('Saving remote preferences', client.credentials.walletName, prefs);
client.savePreferences(prefs, function(err) { client.savePreferences(prefs, function(err) {
if (err) return cb(err); // we ignore errors here
if (err) $log.warn(err);
self._updateRemotePreferencesFor(clients, prefs, cb); self._updateRemotePreferencesFor(clients, prefs, cb);
}); });
@ -188,15 +189,11 @@ angular.module('copayApp.controllers').controller('indexController', function($r
}; };
self._updateRemotePreferencesFor(clients, prefs, function(err) { self._updateRemotePreferencesFor(clients, prefs, function(err) {
if (err) { if (err) return cb(err);
self.handleError(err);
return cb(err);
}
if (!fc) return cb(); if (!fc) return cb();
fc.getPreferences(function(err, preferences) { fc.getPreferences(function(err, preferences) {
if (err) { if (err) {
self.handleError(err);
return cb(err); return cb(err);
} }
self.preferences = preferences; self.preferences = preferences;