aboutsummaryrefslogtreecommitdiff
path: root/src/init.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2012-02-17 14:46:06 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2012-02-17 14:47:56 +0100
commit39231e91052bff032525d99dbe890f742b6180fe (patch)
treec319415d1495a5d7137b3d5d2c71b60212a2c7e8 /src/init.cpp
parentd3896211d2c30de6968a6cead8d1debdc9002513 (diff)
don't allow -daemon in bitcoin-qt (changes only #defines)
Diffstat (limited to 'src/init.cpp')
-rw-r--r--src/init.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/init.cpp b/src/init.cpp
index 22f34aa755..95bf76495d 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -213,7 +213,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" +
@@ -253,7 +253,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;
@@ -284,7 +284,7 @@ bool AppInit2(int argc, char* argv[])
}
#endif
-#ifndef WIN32
+#if !defined(WIN32) && !defined(GUI)
if (fDaemon)
{
// Daemonize