diff options
author | Gavin Andresen <gavinandresen@gmail.com> | 2013-05-03 14:32:47 -0700 |
---|---|---|
committer | Gavin Andresen <gavinandresen@gmail.com> | 2013-05-03 14:32:47 -0700 |
commit | aa62b2c43390d2a5f2b8cdc5b0674b6798d60c29 (patch) | |
tree | a2e8e8fb6b9830b24d9dcbd921cfbbed4c8eba0b /src/wallet.h | |
parent | aa6b3061ee59b8c4d962097118298bafbd080c18 (diff) | |
parent | 2f15e86a68aba56a8ea8e01e58b2fb7b71846b51 (diff) |
Merge pull request #2607 from gavinandresen/loadwalletfix
Do not write to wallet during LoadWallet
Diffstat (limited to 'src/wallet.h')
-rw-r--r-- | src/wallet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet.h b/src/wallet.h index 2e007557b0..348f36a0e4 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -145,7 +145,7 @@ public: // Adds an encrypted key to the store, and saves it to disk. bool AddCryptedKey(const CPubKey &vchPubKey, const std::vector<unsigned char> &vchCryptedSecret); // Adds an encrypted key to the store, without saving it to disk (used by LoadWallet) - bool LoadCryptedKey(const CPubKey &vchPubKey, const std::vector<unsigned char> &vchCryptedSecret) { SetMinVersion(FEATURE_WALLETCRYPT); return CCryptoKeyStore::AddCryptedKey(vchPubKey, vchCryptedSecret); } + bool LoadCryptedKey(const CPubKey &vchPubKey, const std::vector<unsigned char> &vchCryptedSecret); bool AddCScript(const CScript& redeemScript); bool LoadCScript(const CScript& redeemScript) { return CCryptoKeyStore::AddCScript(redeemScript); } |