Merge pull request #161

295348d Do not open wallet from default location automatically (Jacob Brydolf)
pull/2/head
Riccardo Spagni 8 years ago
commit 14c89776f3
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

@ -349,25 +349,13 @@ ApplicationWindow {
currentWallet.history.refresh() // this will refresh model currentWallet.history.refresh() // this will refresh model
} }
function walletsFound() { function walletsFound() {
if (persistentSettings.wallet_path.length > 0) { if (persistentSettings.wallet_path.length > 0) {
var lastOpenedExists = walletManager.walletExists(persistentSettings.wallet_path); return 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 (wallets.length > 0 || lastOpenedExists); return false;
} }
function onTransactionCreated(pendingTransaction,address,paymentId,mixinCount){ function onTransactionCreated(pendingTransaction,address,paymentId,mixinCount){
console.log("Transaction created"); console.log("Transaction created");
hideProcessingSplash(); hideProcessingSplash();