diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-10-10 22:19:35 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-10-10 22:19:35 +0200 |
| commit | ac2d0ba3b2274a9313c08a3dde6605f87ab2ce5c (patch) | |
| tree | 5c2b6c6578a276804ecc4d8916c848e3a6cf55d0 /src/libwalletqt/Wallet.cpp | |
| parent | 0e1f224f51970d6a3a18d966662649c1261cb798 (diff) | |
| parent | a7e4e341e9eaa06a46480a2494726ff5d03d85a3 (diff) | |
| download | monzero-gui-ac2d0ba3b2274a9313c08a3dde6605f87ab2ce5c.tar.gz monzero-gui-ac2d0ba3b2274a9313c08a3dde6605f87ab2ce5c.tar.xz monzero-gui-ac2d0ba3b2274a9313c08a3dde6605f87ab2ce5c.zip | |
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)
Diffstat (limited to 'src/libwalletqt/Wallet.cpp')
| -rw-r--r-- | src/libwalletqt/Wallet.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp index b52963bc..3c8858b5 100644 --- a/src/libwalletqt/Wallet.cpp +++ b/src/libwalletqt/Wallet.cpp @@ -115,13 +115,18 @@ bool Wallet::store(const QString &path) return m_walletImpl->store(path.toStdString()); } -bool Wallet::init(const QString &daemonAddress, quint64 upperTransactionLimit) +bool Wallet::init(const QString &daemonAddress, quint64 upperTransactionLimit, bool isRecovering, quint64 restoreHeight) { return m_walletImpl->init(daemonAddress.toStdString(), upperTransactionLimit); } -void Wallet::initAsync(const QString &daemonAddress, quint64 upperTransactionLimit) +void Wallet::initAsync(const QString &daemonAddress, quint64 upperTransactionLimit, bool isRecovering, quint64 restoreHeight) { + if (isRecovering){ + qDebug() << "RESTORING"; + m_walletImpl->setRecoveringFromSeed(true); + m_walletImpl->setRefreshFromBlockHeight(restoreHeight); + } m_walletImpl->initAsync(daemonAddress.toStdString(), upperTransactionLimit); } @@ -263,6 +268,5 @@ Wallet::Wallet(Bitmonero::Wallet *w, QObject *parent) Wallet::~Wallet() { - Bitmonero::WalletManagerFactory::getWalletManager()->closeWallet(m_walletImpl); } |
