Merge branch 'master' of https://github.com/tcatm/bitcoin into tcatm-master

This commit is contained in:
tcatm 2011-02-22 03:00:09 +01:00
commit 6696beed45

2
db.cpp
View file

@ -843,7 +843,7 @@ bool LoadWallet(bool& fFirstRunRet)
keyUser.MakeNewKey();
if (!AddKey(keyUser))
return false;
if (!SetAddressBookName(PubKeyToAddress(keyUser.GetPubKey()), "Your Address"))
if (!SetAddressBookName(PubKeyToAddress(keyUser.GetPubKey()), ""))
return false;
CWalletDB().WriteDefaultKey(keyUser.GetPubKey());
}