aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2019-01-07 14:39:40 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2019-01-07 14:43:03 +0100
commit0a0b2ea11fde7becbdd1c04205336c3a39bffbc0 (patch)
treedbd87b44ce3dd93f2a3013800b34886581447fb5
parent5ff7b372cdbdf301b74e70dec0a68ec27737c8ad (diff)
parent59dd855d2de77cd72a2b3190a825783ff3627e17 (diff)
downloadbitcoin-0a0b2ea11fde7becbdd1c04205336c3a39bffbc0.tar.xz
Merge #15094: 0.17: Backport for #15085
59dd855d2de77cd72a2b3190a825783ff3627e17 gui: Fix for Incorrect application name when passing -regtest (Ben Carman) Pull request description: Changes the application name to `Bitcoin-Qt-regtest` when instead of `Bitcoin-Qt-testnet` Fixes #15079 Tree-SHA512: 96a8ee5b1906e81f087b3523a59b0d66a9ac0d0cfeb3b48c0762bcac6048c4c17998fc2bf83cff866aacd24f1860c578a2d93baa61e8c2638d265b30f8c2470a
-rw-r--r--src/qt/guiconstants.h1
-rw-r--r--src/qt/networkstyle.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h
index 04b03a5435..4d6006c582 100644
--- a/src/qt/guiconstants.h
+++ b/src/qt/guiconstants.h
@@ -50,5 +50,6 @@ static const int MAX_URI_LENGTH = 255;
#define QAPP_ORG_DOMAIN "bitcoin.org"
#define QAPP_APP_NAME_DEFAULT "Bitcoin-Qt"
#define QAPP_APP_NAME_TESTNET "Bitcoin-Qt-testnet"
+#define QAPP_APP_NAME_REGTEST "Bitcoin-Qt-regtest"
#endif // BITCOIN_QT_GUICONSTANTS_H
diff --git a/src/qt/networkstyle.cpp b/src/qt/networkstyle.cpp
index b134a139b0..da048d3211 100644
--- a/src/qt/networkstyle.cpp
+++ b/src/qt/networkstyle.cpp
@@ -17,7 +17,7 @@ static const struct {
} network_styles[] = {
{"main", QAPP_APP_NAME_DEFAULT, 0, 0, ""},
{"test", QAPP_APP_NAME_TESTNET, 70, 30, QT_TRANSLATE_NOOP("SplashScreen", "[testnet]")},
- {"regtest", QAPP_APP_NAME_TESTNET, 160, 30, "[regtest]"}
+ {"regtest", QAPP_APP_NAME_REGTEST, 160, 30, "[regtest]"}
};
static const unsigned network_styles_count = sizeof(network_styles)/sizeof(*network_styles);