From 5998132d4b56ea48972d229f894d5491293b93bd Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 27 Aug 2020 19:47:10 -0700
Subject: [PATCH] fix standalone hang introduced by 15f95b52a

---
 xwords4/common/server.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xwords4/common/server.c b/xwords4/common/server.c
index 64be17b97..7138364ef 100644
--- a/xwords4/common/server.c
+++ b/xwords4/common/server.c
@@ -533,7 +533,8 @@ server_makeFromStream( MPFORMAL XWEnv xwe, XWStreamCtxt* stream, ModelCtxt* mode
     /* Hack alert: recovering from an apparent bug that leaves the game
        thinking it's a client but being in the host-only XWSTATE_BEGIN
        state. */
-    if ( server->nv.gameState == XWSTATE_BEGIN && !amServer(server) ) {
+    if ( server->nv.gameState == XWSTATE_BEGIN &&
+         server->vol.gi->serverRole == SERVER_ISCLIENT ) {
         XP_LOGFF( "server_makeFromStream(): fixing state" );
         SETSTATE( server, XWSTATE_NONE );
     }