diff options
| -rw-r--r-- | src/wallet/wallet.cpp | 1 | ||||
| -rw-r--r-- | src/wallet/wallet.h | 15 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 9c51723664..488e6690cf 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3933,6 +3933,7 @@ bool CWallet::BackupWallet(const std::string& strDest) CKeyPool::CKeyPool() { nTime = GetTime(); + fInternal = false; } CKeyPool::CKeyPool(const CPubKey& vchPubKeyIn, bool internalIn) diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index bf6c5a2a87..d93830f085 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -114,12 +114,17 @@ public: READWRITE(nVersion); READWRITE(nTime); READWRITE(vchPubKey); - if (nVersion >= FEATURE_HD_SPLIT) - READWRITE(fInternal); - else - { - if (ser_action.ForRead()) + if (ser_action.ForRead()) { + try { + READWRITE(fInternal); + } + catch (...) { + /* flag as external address if we can't read the internal boolean */ fInternal = false; + } + } + else { + READWRITE(fInternal); } } }; |