Merge #11644: Fix qt build broken by 5a5e4e9

laanwj · laanwj · commit 045a80923419 · 2017-11-09T17:17:04.000+01:00
9e9e31a Fix qt build broken by 5a5e4e9 (Matt Corallo) Pull request description: #10368 broke qt build. Tree-SHA512: 3ded6160f5c0034a15e1bb2bb3a065dd3846c069ba9f2320b0c1c3173067f426dbd9f2c637ad0190326e987f43eeed6af8d9f77e9d0a52aefda38d894912caba
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
@@ -661,7 +661,7 @@ bool WalletModel::transactionCanBeBumped(uint256 hash) const
 {
     LOCK2(cs_main, wallet->cs_wallet);
     const CWalletTx *wtx = wallet->GetWalletTx(hash);
-    return wtx && SignalsOptInRBF(*wtx) && !wtx->mapValue.count("replaced_by_txid");
+    return wtx && SignalsOptInRBF(*(wtx->tx)) && !wtx->mapValue.count("replaced_by_txid");
 }
 
 bool WalletModel::bumpFee(uint256 hash)

Original file line number	Diff line number	Diff line change
`@@ -661,7 +661,7 @@ bool WalletModel::transactionCanBeBumped(uint256 hash) const`
`661`	`661`	`{`
`662`	`662`	`LOCK2(cs_main, wallet->cs_wallet);`
`663`	`663`	`const CWalletTx *wtx = wallet->GetWalletTx(hash);`
`664`		`- return wtx && SignalsOptInRBF(*wtx) && !wtx->mapValue.count("replaced_by_txid");`
	`664`	`+ return wtx && SignalsOptInRBF(*(wtx->tx)) && !wtx->mapValue.count("replaced_by_txid");`
`665`	`665`	`}`
`666`	`666`
`667`	`667`	`bool WalletModel::bumpFee(uint256 hash)`