# HG changeset patch
# User nemo
# Date 1351711878 14400
# Node ID aea103d58d834b59c6abbf3b936acf7ac8e88ae0
# Parent  15577789ab8bf523a800fa4f6395580da8f1ce43# Parent  ba735701ce7fa5c50c582aa773e2f3210bb00417
merge w/ trunk

diff -r 15577789ab8b -r aea103d58d83 gameServer/Actions.hs
--- a/gameServer/Actions.hs	Wed Oct 31 15:29:16 2012 -0400
+++ b/gameServer/Actions.hs	Wed Oct 31 15:31:18 2012 -0400
@@ -211,7 +211,7 @@
     rnc <- gets roomsClients
 
     io $ do
-        modifyClient rnc (\cl -> cl{teamsInGame = 0, isReady = False, isMaster = False}) ci
+        modifyClient rnc (\cl -> cl{teamsInGame = 0, isReady = False, isMaster = False, isInGame = False}) ci
         modifyRoom rnc (\r -> r{playersIn = playersIn r + 1}) ri
         moveClientToRoom rnc ri ci