mirror of
https://github.com/bitcoin/bitcoin.git
synced 2024-11-20 10:38:42 +01:00
qt: status WalletModel::Aborted is no longer used
Aborting transactions happens in the GUI now as it should, not the backend.
This commit is contained in:
parent
ca2c83da50
commit
4a61c39456
@ -452,9 +452,8 @@ void SendCoinsDialog::processSendCoinsReturn(const WalletModel::SendCoinsReturn
|
||||
msgParams.first = tr("The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.");
|
||||
msgParams.second = CClientUIInterface::MSG_ERROR;
|
||||
break;
|
||||
// OK and Aborted are included to prevent a compiler warning.
|
||||
// included to prevent a compiler warning.
|
||||
case WalletModel::OK:
|
||||
case WalletModel::Aborted:
|
||||
default:
|
||||
return;
|
||||
}
|
||||
|
@ -75,8 +75,7 @@ public:
|
||||
AmountWithFeeExceedsBalance,
|
||||
DuplicateAddress,
|
||||
TransactionCreationFailed, // Error returned when wallet is still locked
|
||||
TransactionCommitFailed,
|
||||
Aborted
|
||||
TransactionCommitFailed
|
||||
};
|
||||
|
||||
enum EncryptionStatus
|
||||
@ -103,7 +102,7 @@ public:
|
||||
// Return status record for SendCoins, contains error id + information
|
||||
struct SendCoinsReturn
|
||||
{
|
||||
SendCoinsReturn(StatusCode status = Aborted):
|
||||
SendCoinsReturn(StatusCode status = OK):
|
||||
status(status) {}
|
||||
StatusCode status;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user