Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-15 15:41:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'sf/android_branch' into android_multi2

Browse source 
Conflicts:
	xwords4/relay/crefmgr.h
This commit is contained in:
Eric House 2014-12-11 06:22:17 -08:00
commit ddc9f7994c
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
xwords4/relay/crefmgr.h
View file

@ -212,10 +212,13 @@ class SafeCref {
if ( IsValid() ) {
CookieRef* cref = m_cinfo->GetRef();
assert( 0 != cref->GetCid() );
assert( srcID <= nPlayersS );
result = cref->_Connect( m_clientVersion, m_devID,
nPlayersH, nPlayersS, seed, srcID,
m_seenSeed, &m_addr );
if ( srcID <= nPlayersS ) {
result = cref->_Connect( m_clientVersion, m_devID,
nPlayersH, nPlayersS, seed, srcID,
m_seenSeed, &m_addr );
} else {
logf( XW_LOGERROR, "%s: bad srcID: %d", __func__, srcID );
}
}
return result;
}