diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-07-15 16:08:38 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-07-15 16:42:44 +0200 |
| commit | d4211176208b5e4ae4a699c6ce3239447752cdb2 (patch) | |
| tree | 2f1c91d534d1571e3a04c000d66590964bbc213e /src/qt/addresstablemodel.cpp | |
| parent | a24b23622e504f5134dd8011af5bbe68cb9443f1 (diff) | |
| parent | 5b0fc31b1c3d25039262ae2043474b35c14bd30b (diff) | |
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Diffstat (limited to 'src/qt/addresstablemodel.cpp')
| -rw-r--r-- | src/qt/addresstablemodel.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/qt/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp index 9ca7542016..4578ca740f 100644 --- a/src/qt/addresstablemodel.cpp +++ b/src/qt/addresstablemodel.cpp @@ -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); } |