Merge pull request #3649 from matiu/bug/scan-flag

fix backup flag from server
This commit is contained in:
Gustavo Maximiliano Cortez 2015-12-10 17:10:07 -03:00
commit 9f78d35bfb
2 changed files with 2 additions and 1 deletions

View file

@ -177,6 +177,7 @@ module.exports = function(grunt) {
},
nodewebkit: {
options: {
appName: 'Copay',
platforms: ['win', 'osx', 'linux'],
buildDir: './webkitbuilds',
version: '0.12.2',

View file

@ -305,7 +305,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.updateError = bwsError.msg(err, gettext('Could not update Wallet'));
} else {
if (!opts.quiet)
self.setOngoingProcess('scanning', ret.wallet.scanning);
self.setOngoingProcess('scanning', ret.wallet.scanStatus == 'running');
}
return cb(err, ret);
});