Permalink
Browse files

Merge branch 'nftf_0.6' into HEAD

  • Loading branch information...
2 parents 44b69cf + 2e563d6 commit 75eac6ce90d0747edb1395a3563c95f6ea6e8e0c ShadowOfHarbringer committed Mar 25, 2012
Showing with 6 additions and 1 deletion.
  1. +6 −1 src/wallet.cpp
View
@@ -1099,8 +1099,13 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CW
// Check that enough fee is included
int64 nPayFee = nTransactionFee * (1 + (int64)nBytes / 1000);
- bool fAllowFree = CTransaction::AllowFree(dPriority);
+
+ //Bitcoin NFTF Patch - by ShadowOfHarbringer START
+
+ bool fAllowFree = true;
int64 nMinFee = wtxNew.GetMinFee(1, fAllowFree, GMF_SEND);
+ //Bitcoin NFTF Patch - by ShadowOfHarbringer END
+
if (nFeeRet < max(nPayFee, nMinFee))
{
nFeeRet = max(nPayFee, nMinFee);

0 comments on commit 75eac6c

Please sign in to comment.