Bill/monero-gui
1
0
Fork 0
forked from Public/monero-gui
Code Pull Requests Actions Packages Activity

Merge pull request #2012

Browse Source 
c2f1d01 main: automatically fix common wallet cache errors (mmbyday)
This commit is contained in:
luigi1111
2019-04-03 14:27:34 -04:00
parent 91d4470295 c2f1d0168b
commit f3cc2818c5
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
main.qml
View File

@@ -436,12 +436,30 @@ ApplicationWindow {
wizard.wizardState = "wizardHome"; wizard.wizardState = "wizardHome";
rootItem.state = "wizard"; rootItem.state = "wizard";
} }
// opening with password but password doesn't match // try to resolve common wallet cache errors automatically
console.error("Error opening wallet with password: ", wallet.errorString); switch (wallet.errorString) {
passwordDialog.showError(qsTr("Couldn't open wallet: ") + wallet.errorString); case "basic_string::_M_replace_aux":
console.log("closing wallet async : " + wallet.address) walletManager.clearWalletCache(wallet.path);
closeWallet(); walletPassword = passwordDialog.password;
return; appWindow.initialize();
console.error("Repairing wallet cache with error: ", wallet.errorString);
appWindow.showStatusMessage(qsTr("Repairing incompatible wallet cache. Resyncing wallet."),6);
return;
case "std::bad_alloc":
walletManager.clearWalletCache(wallet.path);
walletPassword = passwordDialog.password;
appWindow.initialize();
console.error("Repairing wallet cache with error: ", wallet.errorString);
appWindow.showStatusMessage(qsTr("Repairing incompatible wallet cache. Resyncing wallet."),6);
return;
default:
// opening with password but password doesn't match
console.error("Error opening wallet with password: ", wallet.errorString);
passwordDialog.showError(qsTr("Couldn't open wallet: ") + wallet.errorString);
console.log("closing wallet async : " + wallet.address)
closeWallet();
return;
}
} }
// wallet opened successfully, subscribing for wallet updates // wallet opened successfully, subscribing for wallet updates
@@ -451,7 +469,6 @@ ApplicationWindow {
rootItem.state = "normal"; rootItem.state = "normal";
} }
function onWalletClosed(walletAddress) { function onWalletClosed(walletAddress) {
console.log(">>> wallet closed: " + walletAddress) console.log(">>> wallet closed: " + walletAddress)
} }