aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-04-02 05:02:02 +0800
committerDan Finlay <dan@danfinlay.com>2016-04-02 05:02:02 +0800
commit685711aca4a5dc603bbbc751d4e3ca410853a56d (patch)
tree7d20d46622619620d79e75f6235be728616c541e /app
parent888ade6a1d0fde9fe7a029124007d08dc337578f (diff)
downloadtangerine-wallet-browser-685711aca4a5dc603bbbc751d4e3ca410853a56d.tar
tangerine-wallet-browser-685711aca4a5dc603bbbc751d4e3ca410853a56d.tar.gz
tangerine-wallet-browser-685711aca4a5dc603bbbc751d4e3ca410853a56d.tar.bz2
tangerine-wallet-browser-685711aca4a5dc603bbbc751d4e3ca410853a56d.tar.lz
tangerine-wallet-browser-685711aca4a5dc603bbbc751d4e3ca410853a56d.tar.xz
tangerine-wallet-browser-685711aca4a5dc603bbbc751d4e3ca410853a56d.tar.zst
tangerine-wallet-browser-685711aca4a5dc603bbbc751d4e3ca410853a56d.zip
Call back with wallet restore errors
Diffstat (limited to 'app')
-rw-r--r--app/scripts/lib/idStore.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js
index 1bc1ebcb2..13acd7a82 100644
--- a/app/scripts/lib/idStore.js
+++ b/app/scripts/lib/idStore.js
@@ -227,7 +227,11 @@ IdentityStore.prototype._createIdmgmt = function(password, seed, entropy, cb){
var serializedKeystore = configManager.getWallet()
if (seed) {
- keyStore = this._restoreFromSeed(password, seed, derivedKey)
+ try {
+ keyStore = this._restoreFromSeed(password, seed, derivedKey)
+ } catch (e) {
+ return cb(e)
+ }
// returning user, recovering from storage
} else if (serializedKeystore) {