Merge pull request #3437

2ea980a qt: Treat regtest as testnet (Wladimir J. van der Laan)

1 files changed, 5 insertions, 4 deletions

diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 2f04a71ec0..657b42d16a 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -198,9 +198,10 @@ int main(int argc, char *argv[])
 
     // Application identification (must be set before OptionsModel is initialized,
     // as it is used to locate QSettings)
+    bool isaTestNet = TestNet() || RegTest();
     QApplication::setOrganizationName("Bitcoin");
     QApplication::setOrganizationDomain("bitcoin.org");
-    if (TestNet()) // Separate UI settings for testnet
+    if (isaTestNet) // Separate UI settings for testnets
         QApplication::setApplicationName("Bitcoin-Qt-testnet");
     else
         QApplication::setApplicationName("Bitcoin-Qt");
@@ -231,7 +232,7 @@ int main(int argc, char *argv[])
     PaymentServer* paymentServer = new PaymentServer(&app);
 
     // User language is set up: pick a data directory
-    Intro::pickDataDirectory(TestNet());
+    Intro::pickDataDirectory(isaTestNet);
 
     // Install global event filter that makes sure that long tooltips can be word-wrapped
     app.installEventFilter(new GUIUtil::ToolTipToRichTextFilter(TOOLTIP_WRAP_THRESHOLD, &app));
@@ -259,7 +260,7 @@ int main(int argc, char *argv[])
         return 1;
     }
 
-    SplashScreen splash(QPixmap(), 0);
+    SplashScreen splash(QPixmap(), 0, isaTestNet);
     if (GetBoolArg("-splash", true) && !GetBoolArg("-min", false))
     {
         splash.show();
@@ -281,7 +282,7 @@ int main(int argc, char *argv[])
 
         boost::thread_group threadGroup;
 
-        BitcoinGUI window(TestNet(), 0);
+        BitcoinGUI window(isaTestNet, 0);
         guiref = &window;
 
         QTimer* pollShutdownTimer = new QTimer(guiref);