From 0046825953ce635e2044a16ad046ee01660c1ec7 Mon Sep 17 00:00:00 2001 From: oy Date: Mon, 4 Apr 2011 16:58:53 +0200 Subject: fixed server crash on remove vote --- src/game/server/gamecontext.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp index a57cb00f..8958833c 100644 --- a/src/game/server/gamecontext.cpp +++ b/src/game/server/gamecontext.cpp @@ -1139,6 +1139,11 @@ void CGameContext::ConRemoveVote(IConsole::IResult *pResult, void *pUserData) pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf); return; } + + // inform clients about removed option + CNetMsg_Sv_VoteOptionRemove OptionMsg; + OptionMsg.m_pDescription = pOption->m_aDescription; + pSelf->Server()->SendPackMsg(&OptionMsg, MSGFLAG_VITAL, -1); // TODO: improve this // remove the option @@ -1177,11 +1182,6 @@ void CGameContext::ConRemoveVote(IConsole::IResult *pResult, void *pUserData) pSelf->m_pVoteOptionFirst = pVoteOptionFirst; pSelf->m_pVoteOptionLast = pVoteOptionLast; pSelf->m_NumVoteOptions = NumVoteOptions; - - // inform clients about removed option - CNetMsg_Sv_VoteOptionRemove OptionMsg; - OptionMsg.m_pDescription = pOption->m_aDescription; - pSelf->Server()->SendPackMsg(&OptionMsg, MSGFLAG_VITAL, -1); } void CGameContext::ConForceVote(IConsole::IResult *pResult, void *pUserData) -- cgit 1.4.1