change fee to match fee dialog

presstab · Nov 3, 2014 · 0aaa9f4 · 0aaa9f4
1 parent a05c074
commit 0aaa9f4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
@@ -615,13 +615,13 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
         sPriorityLabel = CoinControlDialog::getPriorityLabel(dPriority);
 
         // Fee
-        int64 nFee	= nTransactionFee;
+        int64 nFee	= nTransactionFee * (1 + (int64)nBytes / 1000);
 
         // Min Fee
         int64 nMinFee = txDummy.GetMinFee(1, false, GMF_SEND, nBytes);
 
-        //nPayFee = max(nFee, nMinFee);
-        nPayFee = nFee;
+        nPayFee = max(nFee, nMinFee);
+        //nPayFee = nFee;
 
         if (nPayAmount > 0)
         {