highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-12 23:18:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sync to bitcoin git e94010b239

Browse Source
This commit is contained in:
Wladimir J. van der Laan
2011-07-07 15:22:54 +02:00
parent fbaee7a853
commit ae3d0aba15
11 changed files with 113 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/qt/addresstablemodel.cpp
View File

@@ -165,10 +165,13 @@ bool AddressTableModel::setData(const QModelIndex & index, const QVariant & valu
// Double-check that we're not overwriting receiving address
if(rec->type == AddressTableEntry::Sending)
{
// Remove old entry
wallet->EraseAddressBookName(rec->address.toStdString());
// Add new entry with new address
wallet->SetAddressBookName(value.toString().toStdString(), rec->label.toStdString());
CRITICAL_BLOCK(wallet->cs_mapAddressBook)
{
// Remove old entry
wallet->DelAddressBookName(rec->address.toStdString());
// Add new entry with new address
wallet->SetAddressBookName(value.toString().toStdString(), rec->label.toStdString());
}
rec->address = value.toString();
}
@@ -274,7 +277,10 @@ bool AddressTableModel::removeRows(int row, int count, const QModelIndex & paren
// Also refuse to remove receiving addresses.
return false;
}
wallet->EraseAddressBookName(rec->address.toStdString());
CRITICAL_BLOCK(wallet->cs_mapAddressBook)
{
wallet->DelAddressBookName(rec->address.toStdString());
}
updateList();
return true;
}