AaronFiore/electrum
1
0
Fork 0
Code Activity

use wallet path instead of config

Browse Source
This commit is contained in:
ThomasV
2015-09-02 10:06:45 +02:00
parent 3ac99af7c6
commit 0cb8c21130
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/qt/__init__.py
View File

@@ -120,7 +120,7 @@ class ElectrumGui:
if path is None: if path is None:
path = config.get_wallet_path() path = config.get_wallet_path()
for w in self.windows: for w in self.windows:
if w.config.get_wallet_path() == path: if w.wallet.storage.path == path:
w.bring_to_top() w.bring_to_top()
break break
else: else:

4
gui/qt/main_window.py
View File

@@ -229,7 +229,7 @@ class ElectrumWindow(QMainWindow):
self.account_selector.hide() self.account_selector.hide()
def close_wallet(self): def close_wallet(self):
print_error('close_wallet', self.config.get_wallet_path()) print_error('close_wallet', self.wallet.storage.path)
if self.wallet: if self.wallet:
self.wallet.storage.put('accounts_expanded', self.accounts_expanded) self.wallet.storage.put('accounts_expanded', self.accounts_expanded)
self.wallet.stop_threads() 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)) 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): 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): def new_wallet(self):
import installwizard import installwizard