Merge NFTF - conflict fix

ShadowOfHarbringer · Feb 12, 2012 · 2e563d6 · 2e563d6
2 parents a15bc17 + db9339a
commit 2e563d6
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/wallet.cpp b/src/wallet.cpp
@@ -1055,8 +1055,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);