From 0cb8c2113040ce693f4ec42adad5fc384d6b5636 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Wed, 2 Sep 2015 10:06:45 +0200 Subject: [PATCH] use wallet path instead of config --- gui/qt/__init__.py | 2 +- 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 index 81cb6c5d..5f3e201a 100644 --- a/gui/qt/__init__.py +++ b/gui/qt/__init__.py @@ -120,7 +120,7 @@ class ElectrumGui: if path is None: path = config.get_wallet_path() for w in self.windows: - if w.config.get_wallet_path() == path: + if w.wallet.storage.path == path: w.bring_to_top() break else: diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py index 567c4c34..4a161feb 100644 --- a/gui/qt/main_window.py +++ b/gui/qt/main_window.py @@ -229,7 +229,7 @@ class ElectrumWindow(QMainWindow): self.account_selector.hide() def close_wallet(self): - print_error('close_wallet', self.config.get_wallet_path()) + print_error('close_wallet', self.wallet.storage.path) if self.wallet: self.wallet.storage.put('accounts_expanded', self.accounts_expanded) self.wallet.stop_threads() @@ -388,7 +388,7 @@ class ElectrumWindow(QMainWindow): QMessageBox.critical(None,"Unable to create backup", _("Electrum was unable to copy your wallet file to the specified location.")+"\n" + str(reason)) def get_wallet_folder(self): - return os.path.dirname(os.path.abspath(self.wallet.storage.path if self.wallet else self.config.get_wallet_path())) + return os.path.dirname(os.path.abspath(self.wallet.storage.path if self.wallet else self.wallet.storage.path)) def new_wallet(self): import installwizard