dash/blackcoin-more
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Wladimir J. van der Laan
2011-07-15 16:08:38 +02:00
parent a24b23622e 5b0fc31b1c
commit d421117620
42 changed files with 2269 additions and 683 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/qt/addresstablemodel.cpp
View File

@@ -38,7 +38,7 @@ struct AddressTablePriv
{
cachedAddressTable.clear();
CRITICAL_BLOCK(wallet->cs_mapKeys)
CRITICAL_BLOCK(cs_mapPubKeys)
CRITICAL_BLOCK(wallet->cs_mapAddressBook)
{
BOOST_FOREACH(const PAIRTYPE(std::string, std::string)& item, wallet->mapAddressBook)
@@ -255,14 +255,15 @@ QString AddressTableModel::addRow(const QString &type, const QString &label, con
{
// Generate a new address to associate with given label, optionally
// set as default receiving address.
strAddress = PubKeyToAddress(wallet->GetKeyFromKeyPool());
strAddress = PubKeyToAddress(wallet->GetOrReuseKeyFromPool());
}
else
{
return QString();
}
// Add entry and update list
wallet->SetAddressBookName(strAddress, strLabel);
CRITICAL_BLOCK(wallet->cs_mapAddressBook)
wallet->SetAddressBookName(strAddress, strLabel);
updateList();
return QString::fromStdString(strAddress);
}