aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2019-07-15 18:41:19 -0500
committerluigi1111 <luigi1111w@gmail.com>2019-07-15 18:41:19 -0500
commit0abd21b434fb305b0dea4cb5c59b4c1bbc521eea (patch)
tree9ad9930ae4f3d801be31250f24271985401dcf19
parent0d29ea33d8a728be4ec85fc7f0a18202acd9eee9 (diff)
parent4b0d1dcfbf0d182cae901e4bfd97bf908fe00218 (diff)
downloadmonzero-gui-0abd21b434fb305b0dea4cb5c59b4c1bbc521eea.tar.gz
monzero-gui-0abd21b434fb305b0dea4cb5c59b4c1bbc521eea.tar.xz
monzero-gui-0abd21b434fb305b0dea4cb5c59b4c1bbc521eea.zip
Merge pull request #2276
4b0d1dc Fixes #2275, transactionCommited txid list (ph4r05)
-rw-r--r--src/libwalletqt/Wallet.cpp3
-rw-r--r--src/libwalletqt/Wallet.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp
index 46f843de..90172d15 100644
--- a/src/libwalletqt/Wallet.cpp
+++ b/src/libwalletqt/Wallet.cpp
@@ -524,7 +524,8 @@ bool Wallet::submitTxFile(const QString &fileName) const
void Wallet::commitTransactionAsync(PendingTransaction *t)
{
m_scheduler.run([this, t] {
- emit transactionCommitted(t->commit(), t, t->txid());
+ auto txIdList = t->txid(); // retrieve before commit
+ emit transactionCommitted(t->commit(), t, txIdList);
});
}
diff --git a/src/libwalletqt/Wallet.h b/src/libwalletqt/Wallet.h
index 95d4a954..15da7a80 100644
--- a/src/libwalletqt/Wallet.h
+++ b/src/libwalletqt/Wallet.h
@@ -351,7 +351,7 @@ signals:
void walletCreationHeightChanged();
void deviceButtonRequest(quint64 buttonCode);
void deviceButtonPressed();
- void transactionCommitted(bool status, PendingTransaction *t, QStringList txid);
+ void transactionCommitted(bool status, PendingTransaction *t, const QStringList& txid);
void heightRefreshed(quint64 walletHeight, quint64 daemonHeight, quint64 targetHeight) const;
// emitted when transaction is created async