aboutsummaryrefslogtreecommitdiff
path: root/src/wallet.cpp
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2012-04-04 05:03:07 -0700
committerPieter Wuille <pieter.wuille@gmail.com>2012-04-04 05:03:07 -0700
commitb0a7e05a45a925d78efd00ecca6dce9b7a9530f9 (patch)
tree13d0f8f8650b545b767c3e6b8de3e2effa385f2f /src/wallet.cpp
parentcadae3588c5553b8c7ef76c14d07041f639fb926 (diff)
parent5cccb13dad589b66957772ee36b3be0ef06ed0dc (diff)
Merge pull request #1019 from laanwj/2012_03_uirefactor
Streamline UI ↔ Core interface
Diffstat (limited to 'src/wallet.cpp')
-rw-r--r--src/wallet.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp
index 27ed7228df..e444e5f696 100644
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -1219,7 +1219,7 @@ string CWallet::SendMoney(CScript scriptPubKey, int64 nValue, CWalletTx& wtxNew,
return strError;
}
- if (fAskFee && !ThreadSafeAskFee(nFeeRequired, _("Sending..."), NULL))
+ if (fAskFee && !ThreadSafeAskFee(nFeeRequired, _("Sending...")))
return "ABORTED";
if (!CommitTransaction(wtxNew, reservekey))
@@ -1279,6 +1279,7 @@ int CWallet::LoadWallet(bool& fFirstRunRet)
bool CWallet::SetAddressBookName(const CBitcoinAddress& address, const string& strName)
{
mapAddressBook[address] = strName;
+ AddressBookRepaint();
if (!fFileBacked)
return false;
return CWalletDB(strWalletFile).WriteName(address.ToString(), strName);
@@ -1287,6 +1288,7 @@ bool CWallet::SetAddressBookName(const CBitcoinAddress& address, const string& s
bool CWallet::DelAddressBookName(const CBitcoinAddress& address)
{
mapAddressBook.erase(address);
+ AddressBookRepaint();
if (!fFileBacked)
return false;
return CWalletDB(strWalletFile).EraseName(address.ToString());