summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
Diffstat (limited to 'src/net')
-rw-r--r--src/net/tradehandler.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp
index af000b3b..9599fa9d 100644
--- a/src/net/tradehandler.cpp
+++ b/src/net/tradehandler.cpp
@@ -125,8 +125,12 @@ void TradeHandler::handleMessage(MessageIn *msg)
tradeWindow->setVisible(true);
break;
case 4: // Trade cancelled
- chatWindow->chatLog("Trade with " + tradePartnerName +
- " cancelled", BY_SERVER);
+ if (player_relations.hasPermission(tradePartnerName,
+ PlayerRelation::SPEECH_LOG))
+ chatWindow->chatLog("Trade with " + tradePartnerName +
+ " cancelled", BY_SERVER);
+ // otherwise ignore silently
+
tradeWindow->setVisible(false);
player_node->setTrading(false);
break;