-paytxfee is now per KB,

BitcoinMiner prioritise transactions by how old their dependencies are

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@176 1a98c847-1fd6-4fd8-948a-caf3550aa51b

1 files changed, 7 insertions, 2 deletions

diff --git a/ui.cpp b/ui.cpp
index a6f550054b..b4eec0a55a 100644
--- a/ui.cpp
+++ b/ui.cpp
@@ -196,7 +196,7 @@ int ThreadSafeMessageBox(const string& message, const string& caption, int style
 
 bool ThreadSafeAskFee(int64 nFeeRequired, const string& strCaption, wxWindow* parent)
 {
-    if (nFeeRequired < CENT || fDaemon)
+    if (nFeeRequired < CENT || nFeeRequired <= nTransactionFee || fDaemon)
         return true;
     string strMessage = strprintf(
         _("This transaction is over the size limit.  You can still send it for a fee of %s, "
@@ -1966,8 +1966,13 @@ void CSendDialog::OnButtonSend(wxCommandEvent& event)
             string strError = SendMoney(scriptPubKey, nValue, wtx, true);
             if (strError == "")
                 wxMessageBox(_("Payment sent  "), _("Sending..."));
-            else if (strError != "ABORTED")
+            else if (strError == "ABORTED")
+                return; // leave send dialog open
+            else
+            {
                 wxMessageBox(strError + "  ", _("Sending..."));
+                EndModal(false);
+            }
         }
         else
         {