diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-10-04 17:38:14 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-10-04 17:38:14 -0500 |
| commit | cdfe9f338fdf46b301fd6eb627b13109fca561ff (patch) | |
| tree | 1c961643ffede90c03d962da8efb638d591bbbc4 /main.qml | |
| parent | adb04cef71c0b0a7dbb53e120ccaa5c661dfa8fd (diff) | |
| parent | f5c5df7b677e10c78bddb2defa7b392bfe42696a (diff) | |
| download | monzero-gui-cdfe9f338fdf46b301fd6eb627b13109fca561ff.tar.gz monzero-gui-cdfe9f338fdf46b301fd6eb627b13109fca561ff.tar.xz monzero-gui-cdfe9f338fdf46b301fd6eb627b13109fca561ff.zip | |
Merge pull request #3025
f5c5df7 main: accountsDir runtime configuration support (xiphon)
Diffstat (limited to 'main.qml')
| -rw-r--r-- | main.qml | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -61,6 +61,7 @@ ApplicationWindow { property bool hideBalanceForced: false property bool ctrlPressed: false property alias persistentSettings : persistentSettings + property string accountsDir: !persistentSettings.portable ? moneroAccountsDir : persistentSettings.portableFolderName + "/wallets" property var currentWallet; property bool disconnected: currentWallet ? currentWallet.disconnected : false property var transaction; @@ -261,7 +262,7 @@ ApplicationWindow { // wallet already opened with wizard, we just need to initialize it var wallet_path = persistentSettings.wallet_path; if(isIOS) - wallet_path = moneroAccountsDir + wallet_path; + wallet_path = appWindow.accountsDir + wallet_path; // console.log("opening wallet at: ", wallet_path, "with password: ", appWindow.walletPassword); console.log("opening wallet at: ", wallet_path, ", network type: ", persistentSettings.nettype == NetworkType.MAINNET ? "mainnet" : persistentSettings.nettype == NetworkType.TESTNET ? "testnet" : "stagenet"); @@ -801,7 +802,7 @@ ApplicationWindow { function walletsFound() { if (persistentSettings.wallet_path.length > 0) { if(isIOS) - return walletManager.walletExists(moneroAccountsDir + persistentSettings.wallet_path); + return walletManager.walletExists(appWindow.accountsDir + persistentSettings.wallet_path); else return walletManager.walletExists(persistentSettings.wallet_path); } @@ -916,7 +917,7 @@ ApplicationWindow { FileDialog { id: saveTxDialog title: "Please choose a location" - folder: "file://" +moneroAccountsDir + folder: "file://" + appWindow.accountsDir selectExisting: false; onAccepted: { |