From 172f006020965ae8763a0610845c051ed1e3b522 Mon Sep 17 00:00:00 2001
From: s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>
Date: Sun, 19 Sep 2010 21:20:34 +0000
Subject: only accept transactions sent by IP address if -allowreceivebyip is
 specified

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@156 1a98c847-1fd6-4fd8-948a-caf3550aa51b
---
 ui.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'ui.cpp')

diff --git a/ui.cpp b/ui.cpp
index 7916f67753..80cf08841f 100644
--- a/ui.cpp
+++ b/ui.cpp
@@ -2186,8 +2186,12 @@ void CSendingDialog::OnReply2(CDataStream& vRecv)
         if (nRet > 0)
         {
             string strMessage;
-            vRecv >> strMessage;
-            Error(_("Transfer was not accepted"));
+            if (!vRecv.empty())
+                vRecv >> strMessage;
+            if (nRet == 2)
+                Error(_("Recipient is not accepting transactions sent by IP address"));
+            else
+                Error(_("Transfer was not accepted"));
             //// todo: enlarge the window and enable a hidden white box to put seller's message
             return;
         }
-- 
cgit v1.2.3