Browse Source

Merge pull request #4197

0b78ba8 Remove fDaemon flag checking on return from main(), which is useless and looks really strange. (Huang Le)
0.10
Wladimir J. van der Laan 11 years ago
parent
commit
9d97e83bf6
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 9
      src/bitcoind.cpp

9
src/bitcoind.cpp

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

Loading…
Cancel
Save