From 8b356fb9ddfe5a810cc1f2cb9528ab444df074f1 Mon Sep 17 00:00:00 2001 From: lotodore Date: Mon, 26 Dec 2011 17:21:35 +0000 Subject: [PATCH] Only reactivate player if it exists in the current game. --- src/net/common/servergamestate.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/net/common/servergamestate.cpp b/src/net/common/servergamestate.cpp index 0817bd33..f87ce4fe 100644 --- a/src/net/common/servergamestate.cpp +++ b/src/net/common/servergamestate.cpp @@ -1314,8 +1314,10 @@ ServerGameStateHand::ReactivatePlayers(boost::shared_ptr server) PlayerIdList::iterator end = reactivateIdList.end(); while (i != end) { boost::shared_ptr tmpPlayer(server->GetGame().getPlayerByUniqueId(*i)); - tmpPlayer->markRemoteAction(); - tmpPlayer->setIsSessionActive(true); + if (tmpPlayer) { + tmpPlayer->markRemoteAction(); + tmpPlayer->setIsSessionActive(true); + } ++i; } }