electrum

commit c00b1f649a97627d2032f570d84744c800db4d96
parent c6027a35780cb2f00c59e0f2dc1401550433b8c7
Author: ThomasV <thomasv@gitorious>
Date:   Tue, 31 Mar 2015 17:56:18 +0200

do not save gui_last_wallet if -w parameter was passed

Diffstat:
M
gui/qt/__init__.py
 | 
2
+-
M
gui/qt/main_window.py
 | 
4
++--

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gui/qt/__init__.py b/gui/qt/__init__.py
@@ -152,7 +152,7 @@ class ElectrumGui:
         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
+                self.config.read_only_options['default_wallet_path'] = last_wallet
         try:
             storage = WalletStorage(self.config)
         except BaseException as e:
diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
@@ -301,8 +301,8 @@ class ElectrumWindow(QMainWindow):
         # load new wallet in gui
         self.load_wallet(wallet)
         # save path
-        self.config.set_key('gui_last_wallet', filename)
-
+        if self.config.get('wallet_path') is None:
+            self.config.set_key('gui_last_wallet', filename)
 
 
     def backup_wallet(self):