diff options
| -rw-r--r-- | src/wallet.cpp | 12 | ||||
| -rw-r--r-- | src/wallet.h | 1 |
2 files changed, 3 insertions, 10 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp index b06187a4b2..e35bce61ef 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -962,21 +962,15 @@ bool CWallet::LoadWallet(bool& fFirstRunRet) return false; fFirstRunRet = vchDefaultKey.empty(); - if (mapKeys.count(vchDefaultKey)) + if (!mapKeys.count(vchDefaultKey)) { - // Set keyUser - keyUser.SetPubKey(vchDefaultKey); - keyUser.SetPrivKey(mapKeys[vchDefaultKey]); - } - else - { - // Create new keyUser and set as default key + // Create new default key RandAddSeedPerfmon(); vchDefaultKey = GetKeyFromKeyPool(); if (!SetAddressBookName(PubKeyToAddress(vchDefaultKey), "")) return false; - CWalletDB(strWalletFile).WriteDefaultKey(keyUser.GetPubKey()); + CWalletDB(strWalletFile).WriteDefaultKey(vchDefaultKey); } CreateThread(ThreadFlushWalletDB, &strWalletFile); diff --git a/src/wallet.h b/src/wallet.h index cda4293bd2..b069d31ce9 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -47,7 +47,6 @@ public: mutable CCriticalSection cs_mapAddressBook; std::vector<unsigned char> vchDefaultKey; - CKey keyUser; bool AddKey(const CKey& key); bool AddToWallet(const CWalletTx& wtxIn); |