Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-22 07:28:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

make rematch-to-self work again

Browse source
This commit is contained in:
Eric House 2024-02-09 11:33:05 -08:00
parent ca970d7874
commit c7b9182eca
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/common/game.c
View file

@ -257,8 +257,6 @@ game_makeRematch( const XWGame* oldGame, XWEnv xwe, XW_UtilCtxt* newUtil,
if ( !server_ri_getAddr( rip, ii, &guestAddr, &nPlayersH ) ) { if ( !server_ri_getAddr( rip, ii, &guestAddr, &nPlayersH ) ) {
break; break;
} }
XP_ASSERT( !comms_addrsAreSame( newGame->comms, &guestAddr,
&selfAddr ) );
NetLaunchInfo nli; NetLaunchInfo nli;
nli_init( &nli, newGI, selfAddrP, nPlayersH, ii + 1 ); nli_init( &nli, newGI, selfAddrP, nPlayersH, ii + 1 );

6
xwords4/linux/gtkmain.c
View file

@ -775,9 +775,9 @@ inviteReceivedGTK( void* closure, const NetLaunchInfo* invite )
if ( ! doIt ) { if ( ! doIt ) {
doIt = XP_FALSE; doIt = XP_FALSE;
XP_LOGFF( "duplicate invite; not creating game" ); XP_LOGFF( "duplicate invite; not creating game" );
/* doIt = GTK_RESPONSE_YES == gtkask( apg->window, */ doIt = GTK_RESPONSE_YES == gtkask( apg->window,
/* "Duplicate invitation received. Accept anyway?", */ "Duplicate invitation received. Accept anyway?",
/* GTK_BUTTONS_YES_NO, NULL ); */ GTK_BUTTONS_YES_NO, NULL );
} }
if ( doIt ) { if ( doIt ) {
gameFromInvite( apg, invite ); gameFromInvite( apg, invite );