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

Merge bug fixes (#1260)

Browse Source 
* Fix for incorrect locking in GetPubKey() (keystore.cpp)

* Fix Cmd-Q / Menu Quit shutdown on OSX

* Addition of ImmatureCreditCached to MarkDirty()

To protect against possible invalidation and to bring conformity to the code.
This commit is contained in:
UdjinM6 2017-01-13 18:02:33 +04:00 committed by GitHub
parent 5cb6486616
commit 053e374e42
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/keystore.cpp
View File

@ -19,6 +19,7 @@ bool CBasicKeyStore::GetPubKey(const CKeyID &address, CPubKey &vchPubKeyOut) con
{ {
CKey key; CKey key;
if (!GetKey(address, key)) { if (!GetKey(address, key)) {
LOCK(cs_KeyStore);
WatchKeyMap::const_iterator it = mapWatchKeys.find(address); WatchKeyMap::const_iterator it = mapWatchKeys.find(address);
if (it != mapWatchKeys.end()) { if (it != mapWatchKeys.end()) {
vchPubKeyOut = it->second; vchPubKeyOut = it->second;

1
src/qt/dash.cpp
View File

@ -411,6 +411,7 @@ void BitcoinApplication::createSplashScreen(const NetworkStyle *networkStyle)
splash->setAttribute(Qt::WA_DeleteOnClose); splash->setAttribute(Qt::WA_DeleteOnClose);
splash->show(); splash->show();
connect(this, SIGNAL(splashFinished(QWidget*)), splash, SLOT(slotFinish(QWidget*))); connect(this, SIGNAL(splashFinished(QWidget*)), splash, SLOT(slotFinish(QWidget*)));
connect(this, SIGNAL(requestedShutdown()), splash, SLOT(close()));
} }
void BitcoinApplication::startThread() void BitcoinApplication::startThread()

1
src/wallet/wallet.h
View File

@ -398,6 +398,7 @@ public:
{ {
fCreditCached = false; fCreditCached = false;
fAvailableCreditCached = false; fAvailableCreditCached = false;
fImmatureCreditCached = false;
fAnonymizedCreditCached = false; fAnonymizedCreditCached = false;
fDenomUnconfCreditCached = false; fDenomUnconfCreditCached = false;
fDenomConfCreditCached = false; fDenomConfCreditCached = false;