X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=6764bea714deaeceb6adc30559d6299fedda72f0;hb=82c76bd978d29f9ec59ccf37df741936e71f278b;hp=73093708324d505d5812990400d0b943665c0ad3;hpb=a5b96d3b2d6ae8d63ff14bb0e4e01b0b4ac32b63;p=xboard.git

diff --git a/backend.c b/backend.c
index 7309370..6764bea 100644
--- a/backend.c
+++ b/backend.c
@@ -493,7 +493,7 @@ int   nrCastlingRights; // For TwoKings, or to implement castling-unknown status
 int   initialRulePlies, FENrulePlies;
 FILE  *serverMoves = NULL; // next two for broadcasting (/serverMoves option)
 int loadFlag = 0;
-int shuffleOpenings;
+Boolean shuffleOpenings;
 int mute; // mute all sounds
 
 // [HGM] vari: next 12 to save and restore variations
@@ -861,6 +861,7 @@ ReplaceEngine(ChessProgramState *cps, int n)
     appData.noChessProgram = FALSE;
     appData.clockMode = TRUE;
     InitEngine(cps, n);
+    UpdateLogos(TRUE);
     if(n) return; // only startup first engine immediately; second can wait
     savCps = cps; // parameter to LoadEngine passed as globals, to allow scheduled calling :-(
     LoadEngine();
@@ -7153,6 +7154,8 @@ TourneyStandings(int display)
     int score[MAXPLAYERS], ranking[MAXPLAYERS], points[MAXPLAYERS], games[MAXPLAYERS];
     char result, *p, *names[MAXPLAYERS];
 
+    if(appData.tourneyType < 0 && !strchr(appData.results, '*'))
+	return strdup(_("Swiss tourney finished")); // standings of Swiss yet TODO
     names[0] = p = strdup(appData.participants);
     while(p = strchr(p, '\n')) *p++ = NULLCHAR, names[++nPlayers] = p; // count participants
 
@@ -7175,7 +7178,6 @@ TourneyStandings(int display)
 	games[b]++;
 	nr++;
     }
-    if(appData.tourneyType < 0) return strdup("Swiss tourney finished"); // standings of Swiss yet TODO
     if(appData.tourneyType > 0) nPlayers = appData.tourneyType; // in gauntlet, list only gauntlet engine(s)
     for(w=0; w<nPlayers; w++) {
 	bScore = -1;
@@ -9657,6 +9659,7 @@ CreateTourney(char *name)
 		return 0;
 	    }
 	    ASSIGN(appData.tourneyFile, name);
+	    if(appData.tourneyType < 0) appData.defaultMatchGames = 1; // Swiss forces games/pairing = 1
 	    if((f = WriteTourneyFile("")) == NULL) return 0;
 	}
 	fclose(f);
@@ -9838,6 +9841,7 @@ NextTourneyGame(int nr, int *swapColors)
     InitEngine(&first, 0);  // initialize ChessProgramStates based on new settings.
     InitEngine(&second, 1);
     CommonEngineInit();     // after this TwoMachinesEvent will create correct engine processes
+    UpdateLogos(FALSE);     // leave display to ModeHiglight()
     return 1;
 }
 
@@ -10276,6 +10280,7 @@ GameEnds(result, resultDetails, whosays)
 	    } else DisplayFatalError(buf, 0, 0);
 	} else { // match through menu; just stop, with or without popup
 	    matchMode = FALSE; appData.matchGames = matchGame = roundNr = 0;
+	    ModeHighlight();
 	    if(ranking){
 		if(strcmp(ranking, "busy")) DisplayNote(ranking);
 	    } else DisplayNote(buf);
@@ -12854,7 +12859,7 @@ TwoMachinesEvent P((void))
 
     gameMode = TwoMachinesPlay;
     pausing = FALSE;
-    ModeHighlight();
+    ModeHighlight(); // [HGM] logo: this triggers display update of logos
     SetGameInfo();
     DisplayTwoMachinesTitle();
     firstMove = TRUE;