From ddffc9810c0f0b84ddd960d07114178a91a47a91 Mon Sep 17 00:00:00 2001 From: Yemel Jardi Date: Thu, 22 May 2014 20:02:12 -0700 Subject: [PATCH] Fix: Bring back to life the error message for wallet already in use --- js/controllers/signin.js | 2 +- js/models/core/Wallet.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/js/controllers/signin.js b/js/controllers/signin.js index 2513784ad..721959d25 100644 --- a/js/controllers/signin.js +++ b/js/controllers/signin.js @@ -83,7 +83,7 @@ angular.module('copay.signin').controller('SigninController', }; function installStartupHandlers(wallet) { - wallet.network.on('error', function(err) { + wallet.on('connectionError', function(err) { $scope.failure = true; }); wallet.on('ready', function() { diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js index e584d19b5..c6236cf47 100644 --- a/js/models/core/Wallet.js +++ b/js/models/core/Wallet.js @@ -222,6 +222,9 @@ Wallet.prototype.netStart = function() { self.log('[Wallet.js.132:openError:] GOT openError'); //TODO self.emit('openError'); }); + net.on('error', function(){ + self.emit('connectionError'); // Bubble the error + }); net.on('close', function() { self.emit('close'); });