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

Transaction history is not crashing and refreshing properly

Browse Source
This commit is contained in:
Ilya Kitaev
2016-10-07 00:47:28 +03:00
parent defc2a414a
commit 0498c3ba64
8 changed files with 74 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/libwalletqt/Wallet.cpp
View File

@@ -32,7 +32,6 @@ public:
virtual void moneyReceived(const std::string &txId, uint64_t amount)
{
qDebug() << __FUNCTION__;
emit m_wallet->moneyReceived(QString::fromStdString(txId), amount);
}
@@ -40,14 +39,12 @@ public:
virtual void newBlock(uint64_t height)
{
// qDebug() << __FUNCTION__;
m_wallet->m_history->refresh();
emit m_wallet->newBlock(height);
}
virtual void updated()
{
qDebug() << __FUNCTION__;
m_wallet->m_history->refresh();
emit m_wallet->updated();
}
@@ -55,7 +52,6 @@ public:
virtual void refreshed()
{
qDebug() << __FUNCTION__;
emit m_wallet->refreshed();
}
@@ -93,6 +89,11 @@ bool Wallet::connected() const
return m_walletImpl->connected();
}
bool Wallet::synchronized() const
{
return m_walletImpl->synchronized();
}
QString Wallet::errorString() const
{
return QString::fromStdString(m_walletImpl->errorString());
@@ -207,19 +208,16 @@ void Wallet::disposeTransaction(PendingTransaction *t)
delete t;
}
TransactionHistory *Wallet::history()
TransactionHistory *Wallet::history() const
{
// if (m_history->count() == 0) {
// m_history->refresh();
// }
return m_history;
}
TransactionHistoryModel *Wallet::historyModel()
TransactionHistoryModel *Wallet::historyModel() const
{
if (!m_historyModel) {
m_historyModel = new TransactionHistoryModel(this);
Wallet * w = const_cast<Wallet*>(this);
m_historyModel = new TransactionHistoryModel(w);
m_historyModel->setTransactionHistory(this->history());
}