aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorJannis Froese <[email protected]>2014-05-01 21:10:19 +0200
committerJannis Froese <[email protected]>2014-06-09 00:44:35 +0200
commit145bc31b83ca7df01e202f7e3fb7c6722a8fe4d9 (patch)
tree6f956b039f0c14017050c53f8d56520123bd62db /src/main.cpp
parentMerge pull request #549 from leofidus/1.7-rpctests (diff)
downloaddiscoin-145bc31b83ca7df01e202f7e3fb7c6722a8fe4d9.tar.xz
discoin-145bc31b83ca7df01e202f7e3fb7c6722a8fe4d9.zip
don't send feeless transactions
(cherry picked from commit 9a2f7a86fca6e243db7745cb1b15b35ce1b97b2e)
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 763b30f99..a95f7cf2d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -791,7 +791,7 @@ int64_t GetMinFee(const CTransaction& tx, unsigned int nBytes, bool fAllowFree,
int64_t nMinFee = (1 + (int64_t)nBytes / 1000) * nBaseFee;
- if (fAllowFree)
+ if (fAllowFree && mode != GMF_SEND)
{
// Free transaction area
if (nBytes < 26000)