diff options
author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-10-26 13:00:01 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-10-26 13:00:16 +0200 |
commit | 9bd109b78d938dfe95d31d089e0c74061c30103f (patch) | |
tree | fa20da1a3ce254e1b0aba36af28d4d5da024a230 /src/qt/walletmodel.cpp | |
parent | 3f875744cb61d63f010900dafdb7bbc451de5ead (diff) | |
parent | a8f5026d6d992fd8d72908c848c5028f0f9a8cd1 (diff) | |
download | bitcoin-9bd109b78d938dfe95d31d089e0c74061c30103f.tar.xz |
Merge #17120: gui: Fix start timer from non QThread
a8f5026d6d992fd8d72908c848c5028f0f9a8cd1 gui: Fix start timer from non QThread (João Barbosa)
Pull request description:
Fixes #16296.
ACKs for top commit:
laanwj:
code review ACK a8f5026d6d992fd8d72908c848c5028f0f9a8cd1
Tree-SHA512: d7b05ac88e188de16cbbe80cb2f773b7976ee07ee876ac94a93f9351856c4f3a9d66a531d3f3748d2dccff8c8d77d9d8227433069ed5909c32be2efeaa32f655
Diffstat (limited to 'src/qt/walletmodel.cpp')
-rw-r--r-- | src/qt/walletmodel.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 08ea1c2409..33801d3907 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -44,11 +44,6 @@ WalletModel::WalletModel(std::unique_ptr<interfaces::Wallet> wallet, interfaces: transactionTableModel = new TransactionTableModel(platformStyle, this); recentRequestsTableModel = new RecentRequestsTableModel(this); - // This timer will be fired repeatedly to update the balance - pollTimer = new QTimer(this); - connect(pollTimer, &QTimer::timeout, this, &WalletModel::pollBalanceChanged); - pollTimer->start(MODEL_UPDATE_DELAY); - subscribeToCoreSignals(); } @@ -57,6 +52,14 @@ WalletModel::~WalletModel() unsubscribeFromCoreSignals(); } +void WalletModel::startPollBalance() +{ + // This timer will be fired repeatedly to update the balance + QTimer* timer = new QTimer(this); + connect(timer, &QTimer::timeout, this, &WalletModel::pollBalanceChanged); + timer->start(MODEL_UPDATE_DELAY); +} + void WalletModel::updateStatus() { EncryptionStatus newEncryptionStatus = getEncryptionStatus(); |