1 files changed, 2 insertions, 7 deletions
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index 17aa0c9d4..9b535c2e6 100644
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -172,15 +172,10 @@ bool AppInit(int argc, char* argv[])
 
 int main(int argc, char* argv[])
 {
-    bool fRet = false;
+    SetupEnvironment();
 
     // Connect bitcoind signal handlers
     noui_connect();
 
-    fRet = AppInit(argc, argv);
-
-    if (fRet && fDaemon)
-        return 0;
-
-    return (fRet ? 0 : 1);
+    return (AppInit(argc, argv) ? 0 : 1);
 }