aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Handlers/TradeHandler.cpp
diff options
context:
space:
mode:
authorkaelima <kaelima@live.se>2012-05-26 18:14:50 +0200
committerkaelima <kaelima@live.se>2012-05-26 18:15:07 +0200
commit624aab7d77c9f0a395611012d17e5c5114992f79 (patch)
tree6d79726811778f7867fb82b236923d8ea6cf0cf9 /src/server/game/Handlers/TradeHandler.cpp
parent5956eb9ae2e8466629a4b4d024b13be49dcba3ca (diff)
Core/Session: Fixed error "received unexpected opcode CMSG_CANCEL_TRADE" when a player is logging out.
Diffstat (limited to 'src/server/game/Handlers/TradeHandler.cpp')
-rwxr-xr-xsrc/server/game/Handlers/TradeHandler.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Handlers/TradeHandler.cpp b/src/server/game/Handlers/TradeHandler.cpp
index dc26aaa42ca..9d7fa7da396 100755
--- a/src/server/game/Handlers/TradeHandler.cpp
+++ b/src/server/game/Handlers/TradeHandler.cpp
@@ -531,7 +531,7 @@ void WorldSession::HandleBeginTradeOpcode(WorldPacket& /*recvPacket*/)
void WorldSession::SendCancelTrade()
{
- if (m_playerRecentlyLogout)
+ if (PlayerRecentlyLoggedOut() || PlayerLogout())
return;
SendTradeStatus(TRADE_STATUS_TRADE_CANCELED);