monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-04-03 12:49:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge df7a369966 into 47f0047c9f

Browse source
This commit is contained in:
plowsof 2025-03-19 00:13:05 -06:00 committed by GitHub
commit 4337190ff2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions

7
js/Wizard.js
View file

@ -76,16 +76,17 @@ function walletPathExists(accountsDir, directory, filename, isIOS, walletManager
var path = accountsDir + filename;
else
var path = directory + filename + "/" + filename;
var path2 = directory + filename;
if (walletManager.walletExists(path))
if (walletManager.walletExists(path) || walletManager.walletExists(path2))
return true;
return false;
}
function unusedWalletName(directory, filename, walletManager) {
function unusedWalletName(directory, filename, isIOS, walletManager) {
for (var i = 0; i < 100; i++) {
var walletName = filename + (i > 0 ? "_" + i : "");
if (!walletManager.walletExists(directory + "/" + walletName + "/" + walletName)) {
if (!walletPathExists(directory, directory, walletName, isIOS, walletManager)) {
return walletName;
}
}

2
wizard/WizardWalletInput.qml
View file

@ -65,7 +65,7 @@ GridLayout {
walletName.error = !walletName.verify();
walletLocation.error = !walletLocation.verify();
walletLocation.text = appWindow.accountsDir;
walletName.text = Wizard.unusedWalletName(appWindow.accountsDir, defaultAccountName, walletManager);
walletName.text = Wizard.unusedWalletName(appWindow.accountsDir, defaultAccountName, isIOS, walletManager);
}
ColumnLayout {