From f93d5f9ffe1e12079e560a735111735924726a06 Mon Sep 17 00:00:00 2001
From: s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>
Date: Thu, 10 Jun 2010 23:10:30 +0000
Subject: automatically change displayed address whenever it receives anything,
 added help and -? for daemon command line rpc commands, only relay addr
 messages to 5 random nodes to save bandwidth, started setting wtx.fFromMe
 flag, trickle out tx inventory messages to protect privacy  -- version 0.2.10

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@81 1a98c847-1fd6-4fd8-948a-caf3550aa51b
---
 db.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'db.cpp')

diff --git a/db.cpp b/db.cpp
index 51cbb309b..e0a672b1e 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();
 
-- 
cgit v1.2.3