File tree Expand file tree Collapse file tree 2 files changed +23
-3
lines changed
electrum/gui/qml/components Expand file tree Collapse file tree 2 files changed +23
-3
lines changed Original file line number Diff line number Diff line change @@ -89,7 +89,17 @@ Item {
89
89
text: qsTr (' Open/Create Wallet' )
90
90
Layout .alignment : Qt .AlignHCenter
91
91
onClicked: {
92
- stack .push (Qt .resolvedUrl (' Wallets.qml' ))
92
+ if (Daemon .availableWallets .rowCount () > 0 ) {
93
+ stack .push (Qt .resolvedUrl (' Wallets.qml' ))
94
+ } else {
95
+ var newww = app .newWalletWizard .createObject (app)
96
+ newww .walletCreated .connect (function () {
97
+ Daemon .availableWallets .reload ()
98
+ // and load the new wallet
99
+ Daemon .load_wallet (newww .path , newww .wizard_data [' password' ])
100
+ })
101
+ newww .open ()
102
+ }
93
103
}
94
104
}
95
105
}
Original file line number Diff line number Diff line change @@ -223,16 +223,26 @@ ApplicationWindow
223
223
})
224
224
dialog .accepted .connect (function () {
225
225
var newww = app .newWalletWizard .createObject (app)
226
- newww .open ()
227
226
newww .walletCreated .connect (function () {
228
227
Daemon .availableWallets .reload ()
229
228
// and load the new wallet
230
229
Daemon .load_wallet (newww .path , newww .wizard_data [' password' ])
231
230
})
231
+ newww .open ()
232
232
})
233
233
dialog .open ()
234
234
} else {
235
- Daemon .load_wallet ()
235
+ if (Daemon .availableWallets .rowCount () > 0 ) {
236
+ Daemon .load_wallet ()
237
+ } else {
238
+ var newww = app .newWalletWizard .createObject (app)
239
+ newww .walletCreated .connect (function () {
240
+ Daemon .availableWallets .reload ()
241
+ // and load the new wallet
242
+ Daemon .load_wallet (newww .path , newww .wizard_data [' password' ])
243
+ })
244
+ newww .open ()
245
+ }
236
246
}
237
247
}
238
248
You can’t perform that action at this time.
0 commit comments