1
mirror of https://github.com/monero-project/monero-gui synced 2024-11-17 14:33:19 +01:00

Merge pull request #44

4da6520 added todo (Jacob Brydolf)
703948c fix corrupt wallet on killed app during sync (Jacob Brydolf)
8367cfa fix restore-height fallback (Jacob Brydolf)
This commit is contained in:
Riccardo Spagni 2016-10-10 23:46:08 +02:00
commit 77445ad0d4
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 3 additions and 2 deletions

View File

@ -144,7 +144,8 @@ ApplicationWindow {
// basicPanel.paymentClicked.connect(handlePayment);
// currentWallet is defined on daemon address change - close/reopen
if (currentWallet !== undefined) {
// TODO: strict comparison here (!==) causes crash after passwordDialog on previously crashed unsynced wallets
if (currentWallet != undefined) {
console.log("closing currentWallet")
walletManager.closeWallet(currentWallet);
}

View File

@ -137,7 +137,7 @@ Rectangle {
appWindow.persistentSettings.auto_donations_amount = settings.auto_donations_amount
appWindow.persistentSettings.daemon_address = settings.daemon_address
appWindow.persistentSettings.testnet = settings.testnet
appWindow.persistentSettings.restore_height = parseInt(settings.restore_height)
appWindow.persistentSettings.restore_height = (isNaN(settings.restore_height))? 0 : settings.restore_height
appWindow.persistentSettings.is_recovering = (settings.is_recovering === undefined)? false : settings.is_recovering
}