diff options
| author | Alex Morcos <morcos@chaincode.com> | 2017-06-28 19:24:28 -0400 |
|---|---|---|
| committer | Alex Morcos <morcos@chaincode.com> | 2017-07-14 23:40:33 -0400 |
| commit | 1983ca6cb3d6e741191206b57585a4b88d9ab86e (patch) | |
| tree | d20778cff042356af12b3eaf8a26b0d4f04f8618 /src/qt/sendcoinsdialog.h | |
| parent | 03ee70116189bb358e7c6224ba0ecb745e8161c2 (diff) | |
| download | bitcoin-1983ca6cb3d6e741191206b57585a4b88d9ab86e.tar.xz | |
Use CoinControl to pass custom fee setting from QT.
This fixes buggy behavior where we were temporarily setting and unsetting the
global payTxFee when trying to send a transaction with a custom fee from the
GUI. The previous behavior was inconsistent depending on the order of using the
RPC call settxfee and clicking various radio buttons in the sendcoinsdialog.
The new behavior is that transactions sent with the GUI will always use either
the smartfee slider value or the custom fee set on the GUI and they will not
affect the global defaults which are only for RPC and initial GUI values.
Diffstat (limited to 'src/qt/sendcoinsdialog.h')
| -rw-r--r-- | src/qt/sendcoinsdialog.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qt/sendcoinsdialog.h b/src/qt/sendcoinsdialog.h index ff7040ac5b..70b4aa5a03 100644 --- a/src/qt/sendcoinsdialog.h +++ b/src/qt/sendcoinsdialog.h @@ -68,6 +68,8 @@ private: void processSendCoinsReturn(const WalletModel::SendCoinsReturn &sendCoinsReturn, const QString &msgArg = QString()); void minimizeFeeSection(bool fMinimize); void updateFeeMinimizedLabel(); + // Update the passed in CCoinControl with state from the GUI + void updateCoinControlState(CCoinControl& ctrl); private Q_SLOTS: void on_sendButton_clicked(); @@ -91,7 +93,6 @@ private Q_SLOTS: void updateFeeSectionControls(); void updateMinFeeLabel(); void updateSmartFeeLabel(); - void updateGlobalFeeVariables(); Q_SIGNALS: // Fired when a message should be reported to the user |