Skip to content

Commit

Permalink
3.7.2.0-Leisure
Browse files Browse the repository at this point in the history
 - Properly fix for wallet not daemonizing, #822 (@denravonska).
  • Loading branch information
denravonska committed Jan 13, 2018
2 parents f814e58 + 8e42611 commit bee72a8
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [3.7.2.0] 2018-01-13
### Fixed
- Properly fix for wallet not daemonizing, #822 (@denravonska).

## [3.7.1.0] 2018-01-10
### Fixed
- Fix several crashes in diagnostic dialog, #816 (@Foggyx420).
Expand Down
2 changes: 1 addition & 1 deletion src/clientversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 3
#define CLIENT_VERSION_MINOR 7
#define CLIENT_VERSION_REVISION 1
#define CLIENT_VERSION_REVISION 2
#define CLIENT_VERSION_BUILD 0

// Converts the parameter X to a string after macro replacement on X has been performed.
Expand Down
12 changes: 5 additions & 7 deletions src/init.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ bool AppInit(int argc, char* argv[])
exit(ret);
}

// Blocking call until shutdown is requested
fRet = AppInit2(threads);
}
catch (std::exception& e) {
Expand All @@ -194,12 +195,6 @@ bool AppInit(int argc, char* argv[])
PrintException(NULL, "AppInit()");
}

// Succesfully initialized, wait for shutdown
if (fRet && !fDaemon)
{
while (!ShutdownRequested())
MilliSleep(500);
}
Shutdown(NULL);

// delete thread handler
Expand Down Expand Up @@ -1030,6 +1025,9 @@ bool AppInit2(ThreadHandlerPtr threads)
// Add wallet transactions that aren't already in a block to mapTransactions
pwalletMain->ReacceptWalletTransactions();

printf("\r\nExiting AppInit2\r\n");
// Succesfully initialized, wait for shutdown
while (!ShutdownRequested())
MilliSleep(500);

return true;
}

0 comments on commit bee72a8

Please sign in to comment.