diff options
| author | Philip Kaufmann <phil.kaufmann@t-online.de> | 2013-06-23 18:04:44 +0200 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2013-08-22 11:05:45 +1000 |
| commit | a2189fbaf65dd56c808dc7429b800e70d31178c3 (patch) | |
| tree | 3a9e6d8fcb69d25f2e9f6f1091252367137f056c /src/qt/splashscreen.cpp | |
| parent | 3624356e82015c980fa7b7e60dfbe128665b1952 (diff) | |
update SelectParamsFromCommandLine() handling/order
- move SelectParamsFromCommandLine() from init.cpp to bitcoin.cpp to allow
to use TestNet() for Bitcoin-Qt instead of GetBoolArg("-testnet", false)
- change order in bitcoind.cpp to match bitcoin.cpp functionality
- hamonize error message strings for missing datadir and failing
SelectParamsFromCommandLine() in bitcoin.cpp and bitcoind.cpp
- use TestNet() call in splashscreen.cpp
Diffstat (limited to 'src/qt/splashscreen.cpp')
| -rw-r--r-- | src/qt/splashscreen.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp index 22cf04486b..7c9bc46c46 100644 --- a/src/qt/splashscreen.cpp +++ b/src/qt/splashscreen.cpp @@ -1,6 +1,7 @@ #include "splashscreen.h" #include "clientversion.h" #include "util.h" +#include "chainparams.h" #include <QApplication> #include <QPainter> @@ -26,7 +27,7 @@ SplashScreen::SplashScreen(const QPixmap &pixmap, Qt::WindowFlags f) : // load the bitmap for writing some text over it QPixmap newPixmap; - if(GetBoolArg("-testnet", false)) { + if(TestNet()) { newPixmap = QPixmap(":/images/splash_testnet"); } else { |