electrum

commit 20fc2da9b5cb64e684c2fbaccdf8da15ddd1a056
parent 44b44279e7e7f5c3809b2973dc088cfd674709ef
Author: ThomasV <thomasv@gitorious>
Date:   Sat, 28 Feb 2015 05:54:27 +0100

do not attemps last_wallet if file does not exist

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

1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/gui/qt/__init__.py b/gui/qt/__init__.py
@@ -149,10 +149,17 @@ class ElectrumGui:
 
     def main(self, url):
 
-        if self.config.get('wallet_path') is None and self.config.get('gui_last_wallet'):
-            self.config.read_only_options['wallet_path'] = self.config.get('gui_last_wallet')
+        last_wallet = self.config.get('gui_last_wallet')
+        if last_wallet is not None and self.config.get('wallet_path') is None:
+            if os.path.exists(last_wallet):
+                self.config.read_only_options['wallet_path'] = last_wallet
+        try:
+            storage = WalletStorage(self.config)
+        except BaseException as e:
+            QMessageBox.warning(None, _('Warning'), str(e), _('OK'))
+            self.config.set_key('gui_last_wallet', None)
+            return
 
-        storage = WalletStorage(self.config)
         if storage.file_exists:
             try:
                 wallet = Wallet(storage)