summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2018-03-23 13:49:16 +0000
committerMichał Górny <mgorny@gentoo.org>2018-04-01 01:08:53 +0200
commitc1066d6df84fc4c3375a52ab174afae1a1c4e0cc (patch)
tree621e0a9a674de7d9f7a1cd02b36145392658b61c /net-p2p/bitcoin-qt/files
parentnet-libs/libbitcoinconsensus: Bump to 0.16.0 (diff)
downloadgentoo-c1066d6df84fc4c3375a52ab174afae1a1c4e0cc.tar.gz
gentoo-c1066d6df84fc4c3375a52ab174afae1a1c4e0cc.tar.bz2
gentoo-c1066d6df84fc4c3375a52ab174afae1a1c4e0cc.zip
net-p2p/bitcoin-qt: Bump to 0.16.0
Closes: https://bugs.gentoo.org/649562 Closes: https://github.com/gentoo/gentoo/pull/7570
Diffstat (limited to 'net-p2p/bitcoin-qt/files')
-rw-r--r--net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.0-fix_mempoolstats.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.0-fix_mempoolstats.patch b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.0-fix_mempoolstats.patch
new file mode 100644
index 000000000000..95219c67982b
--- /dev/null
+++ b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.0-fix_mempoolstats.patch
@@ -0,0 +1,46 @@
+From 450ac607a3568f8c991df1681155de6fa7f5a5cb Mon Sep 17 00:00:00 2001
+From: Luke Dashjr <luke-jr+git@utopios.org>
+Date: Fri, 23 Mar 2018 20:30:11 +0000
+Subject: [PATCH] Bugfix: GUI/MempoolStats: Avoid dereferencing NULL
+
+---
+ src/qt/mempoolstats.cpp | 12 ++++--------
+ 1 file changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/src/qt/mempoolstats.cpp b/src/qt/mempoolstats.cpp
+index ebc72e95d0..50a3ef71ab 100644
+--- a/src/qt/mempoolstats.cpp
++++ b/src/qt/mempoolstats.cpp
+@@ -79,13 +79,9 @@ void MempoolStats::setClientModel(ClientModel *model)
+
+ void MempoolStats::drawChart()
+ {
+- if (!isVisible())
++ if (!(isVisible() && clientModel))
+ return;
+
+- const bool drawTxCount = cbShowNumTxns->isChecked();
+- const bool drawMinFee = cbShowMinFeerate->isChecked();
+- const bool drawDynMemUsage = cbShowMemUsage->isChecked();
+-
+ if (!titleItem)
+ {
+ // create labels (only once)
+@@ -349,11 +345,11 @@ void MempoolStats::drawChart()
+ QPen linePenRed(QColor(188,49,62, 250), 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
+ QPen linePenGreen(QColor(49,188,62, 250), 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
+
+- if (drawTxCount)
++ if (cbShowNumTxns->isChecked())
+ redrawItems.append(scene->addPath(txCountPath, linePenRed));
+- if (drawMinFee)
++ if (cbShowMinFeerate->isChecked())
+ redrawItems.append(scene->addPath(minFeePath, linePenGreen));
+- if (drawDynMemUsage)
++ if (cbShowMemUsage->isChecked())
+ {
+ redrawItems.append(scene->addPath(dynMemUsagePath, linePenBlue));
+ redrawItems.append(scene->addPath(dynMemUsagePathFill, QPen(Qt::NoPen), graBru));
+--
+2.16.1
+