summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gui/popupmenu.cpp2
-rw-r--r--src/net/tmwa/beinghandler.cpp3
2 files changed, 1 insertions, 4 deletions
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 15c5d095b..ce82fa745 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -1137,7 +1137,7 @@ void PopupMenu::showPopup(Window *parent, int x, int y, Item *item,
if (isInventory)
{
- if (tradeWindow)
+ if (tradeWindow && tradeWindow->isVisible())
{
mBrowserBox->addRow(strprintf("@@addtrade|%s@@", _("Add to trade")));
if (cnt > 1)
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index b1c173df6..000941c30 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -757,11 +757,8 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
case SMSG_BEING_NAME_RESPONSE2:
{
int len = msg.readInt16();
- logger->log("len: %d", len);
int beingId = msg.readInt32();
- logger->log("id: %d", beingId);
std::string str = msg.readString(len - 8);
- logger->log("str: %s", str.c_str());
if ((dstBeing = actorSpriteManager->findBeing(beingId)))
{
if (beingId == player_node->getId())