Public/monero-gui
1
0
Fork 1
mirror of https://github.com/monero-project/monero-gui.git synced 2026-04-11 21:17:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

wizard: use m_wallet instead of storing in settingsObj

Browse Source
This commit is contained in:
Jaquee
2017-08-06 17:11:12 +02:00
parent 91953f1a3a
commit bbcb780cfa
7 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main.qml
View File

@@ -196,7 +196,7 @@ ApplicationWindow {
walletManager.setDaemonAddress(persistentSettings.daemon_address)
// wallet already opened with wizard, we just need to initialize it
if (typeof wizard.settings['wallet'] !== 'undefined') {
if (typeof wizard.m_wallet !== 'undefined') {
console.log("using wizard wallet")
//Set restoreHeight
if(persistentSettings.restore_height > 0){
@@ -204,11 +204,11 @@ ApplicationWindow {
restoreHeight = persistentSettings.restore_height
}
connectWallet(wizard.settings['wallet'])
connectWallet(wizard.m_wallet)
isNewWallet = true
// We don't need the wizard wallet any more - delete to avoid conflict with daemon adress change
delete wizard.settings['wallet']
delete wizard.m_wallet
} else {
var wallet_path = walletPath();
if(isIOS)