Merge pull request #4197

0b78ba8 Remove fDaemon flag checking on return from main(), which is useless and looks really strange. (Huang Le)

src/bitcoind.cpp

@@ -174,15 +174,8 @@ int main(int argc, char* argv[])
 {
     SetupEnvironment();
 
-    bool fRet = false;
-
     // Connect bitcoind signal handlers
     noui_connect();
 
-    fRet = AppInit(argc, argv);
+    return (AppInit(argc, argv) ? 0 : 1);
-
-    if (fRet && fDaemon)
-        return 0;
-
-    return (fRet ? 0 : 1);
 }