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

Revert "UI to alert of respend attempt affecting wallet."

Browse Source 
This reverts commit ada5a067c7.

Conflicts:
	src/qt/guiconstants.h
	src/wallet.h
This commit is contained in:
Wladimir J. van der Laan
2014-07-17 14:09:46 +02:00
parent 39d3f2cb40
commit 3015e0bca6
9 changed files with 21 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/qt/walletmodel.cpp
View File

@@ -164,14 +164,6 @@ void WalletModel::checkBalanceChanged()
void WalletModel::updateTransaction(const QString &hash, int status)
{
if (status == CT_GOT_CONFLICT)
{
emit message(tr("Conflict Received"),
tr("WARNING: Transaction may never be confirmed. Its input was seen being spent by another transaction on the network. Wait for confirmation!"),
CClientUIInterface::MSG_WARNING);
return;
}
if(transactionTableModel)
transactionTableModel->updateTransaction(hash, status);