neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix 2 crashes

Browse Source
This commit is contained in:
UdjinM6 2015-07-03 01:09:14 +03:00
parent d39815db32
commit 189e48328d
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/init.cpp
View File

@ -120,7 +120,7 @@ void StartShutdown()
}
bool ShutdownRequested()
{
return fRequestShutdown;
return fRequestShutdown || fRestartRequested;
}
class CCoinsViewErrorCatcher : public CCoinsViewBacked
@ -149,6 +149,7 @@ static CCoinsViewErrorCatcher *pcoinscatcher = NULL;
/** Preparing steps before shutting down or restarting the wallet */
void PrepareShutdown()
{
fRequestShutdown = true; // Needed when we shutdown the wallet
fRestartRequested = true; // Needed when we restart the wallet
LogPrintf("%s: In progress...\n", __func__);
static CCriticalSection cs_Shutdown;

2
src/masternode.cpp
View File

@ -191,6 +191,8 @@ uint256 CMasternode::CalculateScore(int mod, int64_t nBlockHeight)
void CMasternode::Check()
{
if(ShutdownRequested()) return;
//TODO: Random segfault with this line removed
TRY_LOCK(cs_main, lockRecv);
if(!lockRecv) return;

4
src/qt/overviewpage.cpp
View File

@ -306,7 +306,9 @@ void OverviewPage::showOutOfSyncWarning(bool fShow)
void OverviewPage::updateDarksendProgress()
{
if(IsInitialBlockDownload()) return;
if(IsInitialBlockDownload() || ShutdownRequested()) return;
if(!pwalletMain || !walletModel || !walletModel->getOptionsModel()) return;
int64_t nBalance = pwalletMain->GetBalance();
QString strAmountAndRounds;