Merge pull request #4197

0b78ba8 Remove fDaemon flag checking on return from main(), which is useless and looks really strange. (Huang Le)
This commit is contained in:
Wladimir J. van der Laan 2014-05-20 12:38:22 +02:00
commit 9d97e83bf6
No known key found for this signature in database
GPG key ID: 74810B012346C9A6

View file

@ -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);
}