diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-03-11 17:03:08 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-03-11 17:03:24 +0100 |
| commit | fbdf4e5efaa612f05a37b1f0d29e8345b45ae1cb (patch) | |
| tree | 2fa0a77b2dba3a12644688d92a4ae89bffacaace /src/qt/intro.cpp | |
| parent | Merge branch 'match_relay_fee' of git://github.com/mikehearn/bitcoin (diff) | |
| parent | qt: Make it possible again to specify -testnet in config file (diff) | |
| download | discoin-fbdf4e5efaa612f05a37b1f0d29e8345b45ae1cb.tar.xz discoin-fbdf4e5efaa612f05a37b1f0d29e8345b45ae1cb.zip | |
Merge pull request #3844
c52c4e5 qt: Make it possible again to specify -testnet in config file (Wladimir J. van der Laan)
Diffstat (limited to 'src/qt/intro.cpp')
| -rw-r--r-- | src/qt/intro.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index 42833a8a3..3bc19f864 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -146,7 +146,7 @@ QString Intro::getDefaultDataDirectory() return QString::fromStdString(GetDefaultDataDir().string()); } -void Intro::pickDataDirectory(bool fIsTestnet) +void Intro::pickDataDirectory() { namespace fs = boost::filesystem; QSettings settings; @@ -164,10 +164,7 @@ void Intro::pickDataDirectory(bool fIsTestnet) /* If current default data directory does not exist, let the user choose one */ Intro intro; intro.setDataDirectory(dataDir); - if (!fIsTestnet) - intro.setWindowIcon(QIcon(":icons/bitcoin")); - else - intro.setWindowIcon(QIcon(":icons/bitcoin_testnet")); + intro.setWindowIcon(QIcon(":icons/bitcoin")); while(true) { |