diff options
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | src/net/tradehandler.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -2,6 +2,7 @@ * src/gui/shop.cpp, src/gui/browserbox.cpp, src/net/tradehandler.cpp: Fixed compilation errors. Fixed trade bug (although a little hacky right now). + * src/net/tradehandler.cpp: Changed bug fix as requested by Bjørn. 2008-06-08 Fate <fate.tmw@googlemail.com> diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp index ed1536eb..af000b3b 100644 --- a/src/net/tradehandler.cpp +++ b/src/net/tradehandler.cpp @@ -159,12 +159,12 @@ void TradeHandler::handleMessage(MessageIn *msg) // Trade: New Item add response (was 0x00ea, now 01b1) { const int index = msg->readInt16(); - if (index == 0) + Item *item = player_node->getInventory()->getItem(index); + if (!item) { tradeWindow->receivedOk(true); return; } - Item *item = player_node->getInventory()->getItem(index); Sint16 quantity = msg->readInt16(); switch (msg->readInt8()) |