electrum

commit 6581cd93bb43a2f044d31112e04fe570bca09518
parent ec5e33149ffa48db06f7a7ce542161e27caecfe9
Author: ThomasV <thomasv@electrum.org>
Date:   Wed,  1 Mar 2017 20:10:47 +0100

load_wallet: return from loop if the error is not invalid password

Diffstat:
M
gui/qt/__init__.py
 | 
8
++++++--

1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/gui/qt/__init__.py b/gui/qt/__init__.py
@@ -43,7 +43,7 @@ from electrum.paymentrequest import InvoiceStore
 from electrum.contacts import Contacts
 from electrum.synchronizer import Synchronizer
 from electrum.verifier import SPV
-from electrum.util import DebugMem, UserCancelled
+from electrum.util import DebugMem, UserCancelled, InvalidPassword
 from electrum.wallet import Abstract_Wallet
 from installwizard import InstallWizard, GoBack
 
@@ -176,9 +176,13 @@ class ElectrumGui:
                         break
                     except UserCancelled:
                         return
-                    except BaseException as e:
+                    except InvalidPassword as e:
                         QMessageBox.information(None, _('Error'), str(e), _('OK'))
                         continue
+                    except BaseException as e:
+                        traceback.print_exc(file=sys.stdout)
+                        QMessageBox.information(None, _('Error'), str(e), _('OK'))
+                        return
             w = self.create_window_for_wallet(wallet)
         if uri:
             w.pay_to_URI(uri)