mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2024-12-28 09:58:30 +01:00
merge android branch heads
This commit is contained in:
commit
4123de3560
1 changed files with 7 additions and 4 deletions
|
@ -212,10 +212,13 @@ class SafeCref {
|
||||||
if ( IsValid() ) {
|
if ( IsValid() ) {
|
||||||
CookieRef* cref = m_cinfo->GetRef();
|
CookieRef* cref = m_cinfo->GetRef();
|
||||||
assert( 0 != cref->GetCid() );
|
assert( 0 != cref->GetCid() );
|
||||||
assert( srcID <= nPlayersS );
|
if ( srcID <= nPlayersS ) {
|
||||||
result = cref->_Connect( m_clientVersion, m_devID,
|
result = cref->_Connect( m_clientVersion, m_devID,
|
||||||
nPlayersH, nPlayersS, seed, srcID,
|
nPlayersH, nPlayersS, seed, srcID,
|
||||||
m_seenSeed, &m_addr );
|
m_seenSeed, &m_addr );
|
||||||
|
} else {
|
||||||
|
logf( XW_LOGERROR, "%s: bad srcID: %d", __func__, srcID );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue