aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-05-20 12:38:22 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-05-20 12:38:27 +0200
commit9d97e83bf677ce595c6b2dc5d6805c2fcb1bc05b (patch)
tree74e28f38bdaa97aeb05ce651978da144d48fcb54
parentec8a0753d56e3a5ded949b7aecca37c9e34cba86 (diff)
parent0b78ba8ad69d55817f2b62c631a71b5ac32549f1 (diff)
downloadbitcoin-9d97e83bf677ce595c6b2dc5d6805c2fcb1bc05b.tar.xz
Merge pull request #4197
0b78ba8 Remove fDaemon flag checking on return from main(), which is useless and looks really strange. (Huang Le)
-rw-r--r--src/bitcoind.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index 78c8b2ba0e..9b535c2e6b 100644
--- a/src/bitcoind.cpp
+++ b/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);
-
- if (fRet && fDaemon)
- return 0;
-
- return (fRet ? 0 : 1);
+ return (AppInit(argc, argv) ? 0 : 1);
}