aboutsummaryrefslogtreecommitdiff
path: root/db.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'db.cpp')
-rw-r--r--db.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/db.cpp b/db.cpp
index 51cbb309b4..e0a672b1ee 100644
--- a/db.cpp
+++ b/db.cpp
@@ -511,9 +511,9 @@ bool LoadAddresses()
// CWalletDB
//
-bool CWalletDB::LoadWallet(vector<unsigned char>& vchDefaultKeyRet)
+bool CWalletDB::LoadWallet()
{
- vchDefaultKeyRet.clear();
+ vchDefaultKey.clear();
int nFileVersion = 0;
// Modify defaults
@@ -587,7 +587,7 @@ bool CWalletDB::LoadWallet(vector<unsigned char>& vchDefaultKeyRet)
}
else if (strType == "defaultkey")
{
- ssValue >> vchDefaultKeyRet;
+ ssValue >> vchDefaultKey;
}
else if (strType == "version")
{
@@ -650,8 +650,7 @@ bool CWalletDB::LoadWallet(vector<unsigned char>& vchDefaultKeyRet)
bool LoadWallet(bool& fFirstRunRet)
{
fFirstRunRet = false;
- vector<unsigned char> vchDefaultKey;
- if (!CWalletDB("cr+").LoadWallet(vchDefaultKey))
+ if (!CWalletDB("cr+").LoadWallet())
return false;
fFirstRunRet = vchDefaultKey.empty();