From c7b9182eca76e4b7fec7e66a7c2ecacf8d2bac78 Mon Sep 17 00:00:00 2001 From: Eric House Date: Fri, 9 Feb 2024 11:33:05 -0800 Subject: [PATCH] make rematch-to-self work again --- xwords4/common/game.c | 2 -- xwords4/linux/gtkmain.c | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/xwords4/common/game.c b/xwords4/common/game.c index 2b421494c..06cf85232 100644 --- a/xwords4/common/game.c +++ b/xwords4/common/game.c @@ -257,8 +257,6 @@ game_makeRematch( const XWGame* oldGame, XWEnv xwe, XW_UtilCtxt* newUtil, if ( !server_ri_getAddr( rip, ii, &guestAddr, &nPlayersH ) ) { break; } - XP_ASSERT( !comms_addrsAreSame( newGame->comms, &guestAddr, - &selfAddr ) ); NetLaunchInfo nli; nli_init( &nli, newGI, selfAddrP, nPlayersH, ii + 1 ); diff --git a/xwords4/linux/gtkmain.c b/xwords4/linux/gtkmain.c index c1dad5561..4e3b04834 100644 --- a/xwords4/linux/gtkmain.c +++ b/xwords4/linux/gtkmain.c @@ -775,9 +775,9 @@ inviteReceivedGTK( void* closure, const NetLaunchInfo* invite ) if ( ! doIt ) { doIt = XP_FALSE; XP_LOGFF( "duplicate invite; not creating game" ); - /* doIt = GTK_RESPONSE_YES == gtkask( apg->window, */ - /* "Duplicate invitation received. Accept anyway?", */ - /* GTK_BUTTONS_YES_NO, NULL ); */ + doIt = GTK_RESPONSE_YES == gtkask( apg->window, + "Duplicate invitation received. Accept anyway?", + GTK_BUTTONS_YES_NO, NULL ); } if ( doIt ) { gameFromInvite( apg, invite );