Skip to content

Commit 4a61c39

Browse files
committed
qt: status WalletModel::Aborted is no longer used
Aborting transactions happens in the GUI now as it should, not the backend.
1 parent ca2c83d commit 4a61c39

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

src/qt/sendcoinsdialog.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -452,9 +452,8 @@ void SendCoinsDialog::processSendCoinsReturn(const WalletModel::SendCoinsReturn
452452
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.");
453453
msgParams.second = CClientUIInterface::MSG_ERROR;
454454
break;
455-
// OK and Aborted are included to prevent a compiler warning.
455+
// included to prevent a compiler warning.
456456
case WalletModel::OK:
457-
case WalletModel::Aborted:
458457
default:
459458
return;
460459
}

src/qt/walletmodel.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ class WalletModel : public QObject
7575
AmountWithFeeExceedsBalance,
7676
DuplicateAddress,
7777
TransactionCreationFailed, // Error returned when wallet is still locked
78-
TransactionCommitFailed,
79-
Aborted
78+
TransactionCommitFailed
8079
};
8180

8281
enum EncryptionStatus
@@ -103,7 +102,7 @@ class WalletModel : public QObject
103102
// Return status record for SendCoins, contains error id + information
104103
struct SendCoinsReturn
105104
{
106-
SendCoinsReturn(StatusCode status = Aborted):
105+
SendCoinsReturn(StatusCode status = OK):
107106
status(status) {}
108107
StatusCode status;
109108
};

0 commit comments

Comments
 (0)