Merge pull request #43

a7e4e34 make sure wallet is closed on app close (Jacob Brydolf)
a88c031 continue recovering from seed on open if not finished (Jacob Brydolf)
625ae77 wizard: save recovering state (Jacob Brydolf)
06d628b libwalletqt: added isRecovering state (Jacob Brydolf)
1ca4fd2 one more variable fix (Jacob Brydolf)

2 files changed, 4 insertions, 2 deletions

diff --git a/wizard/WizardMain.qml b/wizard/WizardMain.qml
index 3168733b..78a8ea06 100644
--- a/wizard/WizardMain.qml
+++ b/wizard/WizardMain.qml
@@ -138,6 +138,7 @@ Rectangle {
         appWindow.persistentSettings.daemon_address = settings.daemon_address
         appWindow.persistentSettings.testnet = settings.testnet
         appWindow.persistentSettings.restore_height = parseInt(settings.restore_height)
+        appWindow.persistentSettings.is_recovering = (settings.is_recovering === undefined)? false : settings.is_recovering
 
     }
 
diff --git a/wizard/WizardRecoveryWallet.qml b/wizard/WizardRecoveryWallet.qml
index 7f6d87f4..f4c5091e 100644
--- a/wizard/WizardRecoveryWallet.qml
+++ b/wizard/WizardRecoveryWallet.qml
@@ -54,17 +54,18 @@ Item {
         settingsObject['account_name'] = uiItem.accountNameText
         settingsObject['words'] = Utils.lineBreaksToSpaces(uiItem.wordsTextItem.memoText)
         settingsObject['wallet_path'] = uiItem.walletPath
-        settingsObject['restoreHeight'] = parseInt(uiItem.restoreHeight)
+        settingsObject['restore_height'] = parseInt(uiItem.restoreHeight)
         return recoveryWallet(settingsObject)
     }
 
     function recoveryWallet(settingsObject) {
         var testnet = appWindow.persistentSettings.testnet;
-        var restoreHeight = settingsObject.restoreHeight;
+        var restoreHeight = settingsObject.restore_height;
         var wallet = walletManager.recoveryWallet(oshelper.temporaryFilename(), settingsObject.words, testnet, restoreHeight);
         var success = wallet.status === Wallet.Status_Ok;
         if (success) {
             settingsObject['wallet'] = wallet;
+            settingsObject['is_recovering'] = true;
         } else {
             walletManager.closeWallet(wallet);
         }