diff options
| author | Wladimir J. van der Laan <[email protected]> | 2012-12-05 23:30:06 -0800 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2012-12-05 23:30:06 -0800 |
| commit | 25fd38090a96fbfc755fb2e3058eafd828e84573 (patch) | |
| tree | 3967a0f95373515562f2ddae28b5ae341d1a8f59 /src/qt/bitcoin.cpp | |
| parent | Merge pull request #2056 from sipa/fix_2052 (diff) | |
| parent | rework ThreadSafeAskFee() / askFee() functions (diff) | |
| download | discoin-25fd38090a96fbfc755fb2e3058eafd828e84573.tar.xz discoin-25fd38090a96fbfc755fb2e3058eafd828e84573.zip | |
Merge pull request #2066 from Diapolo/small_uiint_changes
UI interface changes
Diffstat (limited to 'src/qt/bitcoin.cpp')
| -rw-r--r-- | src/qt/bitcoin.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 95d956dd8..dbdfade0b 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -54,12 +54,13 @@ static void ThreadSafeMessageBox(const std::string& message, const std::string& } } -static bool ThreadSafeAskFee(int64 nFeeRequired, const std::string& strCaption) +static bool ThreadSafeAskFee(int64 nFeeRequired) { if(!guiref) return false; if(nFeeRequired < MIN_TX_FEE || nFeeRequired <= nTransactionFee || fDaemon) return true; + bool payFee = false; QMetaObject::invokeMethod(guiref, "askFee", GUIUtil::blockingGUIThreadConnection(), |