diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-02-17 14:46:06 +0100 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-02-17 09:14:38 -0500 |
| commit | 25be0597caebe00f5d47199404574d93d8f76995 (patch) | |
| tree | b74793e4e7dff0a23d8837d1760baf81438f96ed | |
| parent | 6928794f56738c002fd1e129cb64ffad0533b64f (diff) | |
| download | bitcoin-25be0597caebe00f5d47199404574d93d8f76995.tar.xz | |
don't allow -daemon in bitcoin-qt (changes only #defines)
| -rw-r--r-- | src/init.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/init.cpp b/src/init.cpp index 51e9ed604e..bb549ec42b 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -209,7 +209,7 @@ bool AppInit2(int argc, char* argv[]) #ifdef GUI " -server \t\t " + _("Accept command line and JSON-RPC commands\n") + #endif -#ifndef WIN32 +#if !defined(WIN32) && !defined(GUI) " -daemon \t\t " + _("Run in the background as a daemon and accept commands\n") + #endif " -testnet \t\t " + _("Use the test network\n") + @@ -248,7 +248,7 @@ bool AppInit2(int argc, char* argv[]) fTestNet = GetBoolArg("-testnet"); fDebug = GetBoolArg("-debug"); -#ifndef WIN32 +#if !defined(WIN32) && !defined(GUI) fDaemon = GetBoolArg("-daemon"); #else fDaemon = false; @@ -279,7 +279,7 @@ bool AppInit2(int argc, char* argv[]) } #endif -#ifndef WIN32 +#if !defined(WIN32) && !defined(GUI) if (fDaemon) { // Daemonize |