diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-11-17 16:59:02 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-11-17 16:59:02 +0200 |
| commit | 14c89776f3bffc62e36f1823a6f2c896dfd7cb88 (patch) | |
| tree | 66cdf2cae54d4253b513c8046115e926409434f3 | |
| parent | 9b5b24a26186aee05edd6a9c50bd1c24e603f0e7 (diff) | |
| parent | 295348da0197a7c51fafcdbbe4faecbceafdb942 (diff) | |
| download | monzero-gui-14c89776f3bffc62e36f1823a6f2c896dfd7cb88.tar.gz monzero-gui-14c89776f3bffc62e36f1823a6f2c896dfd7cb88.tar.xz monzero-gui-14c89776f3bffc62e36f1823a6f2c896dfd7cb88.zip | |
Merge pull request #161
295348d Do not open wallet from default location automatically (Jacob Brydolf)
| -rw-r--r-- | main.qml | 16 |
1 files changed, 2 insertions, 14 deletions
@@ -349,25 +349,13 @@ ApplicationWindow { currentWallet.history.refresh() // this will refresh model } - - function walletsFound() { if (persistentSettings.wallet_path.length > 0) { - var lastOpenedExists = walletManager.walletExists(persistentSettings.wallet_path); - if (lastOpenedExists) { - console.log("Last opened wallet exists in:",persistentSettings.wallet_path) - } - } - - // Check if wallets exists in default path - var wallets = walletManager.findWallets(moneroAccountsDir); - if (wallets.length === 0) { - wallets = walletManager.findWallets(applicationDirectory); + return walletManager.walletExists(persistentSettings.wallet_path); } - return (wallets.length > 0 || lastOpenedExists); + return false; } - function onTransactionCreated(pendingTransaction,address,paymentId,mixinCount){ console.log("Transaction created"); hideProcessingSplash(); |
