diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-11-05 04:06:08 -0800 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-11-05 04:06:08 -0800 |
| commit | 25d056a58ffdf790c6bf4d9b6bbd65be44f73fc2 (patch) | |
| tree | 8c93c2d7d850323cd4defd209e7fc6bebcd4041a /src/init.cpp | |
| parent | 63bea1d2e644e930900fc7225359c0772eff4aa4 (diff) | |
| parent | e30bd78f8133fe55ff0bf9e0d6a47a58357d9056 (diff) | |
| download | bitcoin-25d056a58ffdf790c6bf4d9b6bbd65be44f73fc2.tar.xz | |
Merge pull request #3196 from laanwj/2013_11_nohavegui
No more fHaveGUI
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/init.cpp b/src/init.cpp index eb46aed999..80ba65f807 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -363,7 +363,7 @@ void ThreadImport(std::vector<boost::filesystem::path> vImportFiles) /** Initialize bitcoin. * @pre Parameters should be parsed and config file should be read. */ -bool AppInit2(boost::thread_group& threadGroup) +bool AppInit2(boost::thread_group& threadGroup, bool fForceServer) { // ********************************************************* Step 1: setup #ifdef _MSC_VER @@ -490,14 +490,11 @@ bool AppInit2(boost::thread_group& threadGroup) else if (nScriptCheckThreads > MAX_SCRIPTCHECK_THREADS) nScriptCheckThreads = MAX_SCRIPTCHECK_THREADS; - if (fDaemon) + if (fDaemon || fForceServer) fServer = true; else fServer = GetBoolArg("-server", false); - /* force fServer when running without GUI */ - if (!fHaveGUI) - fServer = true; fPrintToConsole = GetBoolArg("-printtoconsole", false); fPrintToDebugger = GetBoolArg("-printtodebugger", false); fLogTimestamps = GetBoolArg("-logtimestamps", true); |