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

Merge pull request #44

Browse Source 
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
parent ac2d0ba3b2 4da6520aab
commit 77445ad0d4
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
main.qml
View File

@@ -144,7 +144,8 @@ ApplicationWindow {
// basicPanel.paymentClicked.connect(handlePayment); // basicPanel.paymentClicked.connect(handlePayment);
// currentWallet is defined on daemon address change - close/reopen // 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") console.log("closing currentWallet")
walletManager.closeWallet(currentWallet); walletManager.closeWallet(currentWallet);
} }

2
wizard/WizardMain.qml
View File

@@ -137,7 +137,7 @@ Rectangle {
appWindow.persistentSettings.auto_donations_amount = settings.auto_donations_amount appWindow.persistentSettings.auto_donations_amount = settings.auto_donations_amount
appWindow.persistentSettings.daemon_address = settings.daemon_address appWindow.persistentSettings.daemon_address = settings.daemon_address
appWindow.persistentSettings.testnet = settings.testnet 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 appWindow.persistentSettings.is_recovering = (settings.is_recovering === undefined)? false : settings.is_recovering
} }