From 8367cfab8563891b75c4109ae0c6128c630c4be3 Mon Sep 17 00:00:00 2001 From: Jacob Brydolf Date: Mon, 10 Oct 2016 22:50:14 +0200 Subject: [PATCH 1/3] fix restore-height fallback --- wizard/WizardMain.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wizard/WizardMain.qml b/wizard/WizardMain.qml index 78a8ea06..097fb58a 100644 --- a/wizard/WizardMain.qml +++ b/wizard/WizardMain.qml @@ -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 } From 703948cec49bceaaa8dfa8da4a410b3982040034 Mon Sep 17 00:00:00 2001 From: Jacob Brydolf Date: Mon, 10 Oct 2016 22:52:32 +0200 Subject: [PATCH 2/3] fix corrupt wallet on killed app during sync --- main.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.qml b/main.qml index 5a6bcabb..89097b1e 100644 --- a/main.qml +++ b/main.qml @@ -144,7 +144,7 @@ ApplicationWindow { // basicPanel.paymentClicked.connect(handlePayment); // currentWallet is defined on daemon address change - close/reopen - if (currentWallet !== undefined) { + if (currentWallet != undefined) { console.log("closing currentWallet") walletManager.closeWallet(currentWallet); } From 4da6520aab957fc729385735381abbc5c2e97cdb Mon Sep 17 00:00:00 2001 From: Jacob Brydolf Date: Mon, 10 Oct 2016 23:23:17 +0200 Subject: [PATCH 3/3] added todo --- main.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/main.qml b/main.qml index 89097b1e..a4a91a50 100644 --- a/main.qml +++ b/main.qml @@ -144,6 +144,7 @@ ApplicationWindow { // basicPanel.paymentClicked.connect(handlePayment); // currentWallet is defined on daemon address change - close/reopen + // TODO: strict comparison here (!==) causes crash after passwordDialog on previously crashed unsynced wallets if (currentWallet != undefined) { console.log("closing currentWallet") walletManager.closeWallet(currentWallet);