Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-04 23:02:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't drop duplicate reconnect

Browse source 
When Android client is backgrounded with a game playing (BoardActivity
on top) then brought to front again it fails to reconnect to relay
because it didn't disconnect and the relay thinks it's still there. The
right fix is in making the java code do the right thing (complete
disconnect), but it seems harmless to just honor the reconnect in this
case. Doesn't even cause leaks, per valgrind.
This commit is contained in:
Eric House 2017-06-06 06:27:58 -07:00
parent 59285aa9f4
commit f06e7bdd98
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
xwords4/relay/cref.cpp
View file

@ -248,12 +248,11 @@ CookieRef::_Reconnect( int clientVersion, DevID* devID, HostID hid,
logf( XW_LOGINFO, "%s: failing because spot taken", __func__ );
} else {
if ( alreadyHere ) {
logf( XW_LOGINFO, "%s: dropping because already here",
__func__ );
} else {
pushReconnectEvent( clientVersion, devID, hid, nPlayersH,
nPlayersS, seed, addr );
logf( XW_LOGERROR, "%s: dropping because already here", __func__ );
}
pushReconnectEvent( clientVersion, devID, hid, nPlayersH, nPlayersS,
seed, addr );
if ( gameDead ) {
pushGameDead( addr );
}