X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gamelist.c;h=f7db15cfc2e626dd2ec8da2d405142aa371d0d8b;hb=4011e8678d85310eedf19fd00aa5d96a9a60770a;hp=62b4e83a12046ef7f3bee2302fadd820484cf756;hpb=e6e38912837a4fe2464356408d10dee950b3121c;p=xboard.git

diff --git a/gamelist.c b/gamelist.c
index 62b4e83..f7db15c 100644
--- a/gamelist.c
+++ b/gamelist.c
@@ -1,7 +1,7 @@
 /*
  * gamelist.c -- Functions to manage a gamelist
  *
- * Copyright 1995, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
+ * Copyright 1995, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
@@ -180,6 +180,7 @@ GameListInitGameInfo (GameInfo *gameInfo)
     gameInfo->whiteRating = -1; /* unknown */
     gameInfo->blackRating = -1; /* unknown */
     gameInfo->variant = VariantNormal;
+    gameInfo->variantName = NULL;
     gameInfo->outOfBook = NULL;
     gameInfo->resultDetails = NULL;
 }
@@ -358,6 +359,8 @@ GameListBuild (FILE *f)
         case GameIsDrawn:
         case GameUnfinished:
 	    if(!currentListGame) break;
+	    if(currentListGame->gameInfo.result == GameUnfinished)
+		currentListGame->gameInfo.result = cm; // correct result tag with actual result
 	    if (currentListGame->gameInfo.resultDetails != NULL) {
 		free(currentListGame->gameInfo.resultDetails);
 	    }
@@ -373,7 +376,7 @@ GameListBuild (FILE *f)
 	}
 	if(gameNumber % 1000 == 0) {
 	    snprintf(buf, MSG_SIZ, _("Reading game file (%d)"), gameNumber);
-	    DisplayTitle(buf);
+	    DisplayTitle(buf); DoEvents();
 	}
     }
     while (cm != (ChessMove) 0);
@@ -437,6 +440,9 @@ ClearGameInfo (GameInfo *gameInfo)
     if (gameInfo->extraTags != NULL) {
 	free(gameInfo->extraTags);
     }
+    if (gameInfo->variantName != NULL) {
+        free(gameInfo->variantName);
+    }
     if (gameInfo->outOfBook != NULL) {
         free(gameInfo->outOfBook);
     }
@@ -513,6 +519,8 @@ GameListLine (int number, GameInfo * gameInfo)
             strncpy( buf, gameInfo->timeControl ? gameInfo->timeControl : "?", MAX_FIELD_LEN );
             break;
         case GLT_VARIANT:
+            strncpy( buf, gameInfo->variantName ? gameInfo->variantName : VariantName(gameInfo->variant), MAX_FIELD_LEN );
+//            strncpy( buf, VariantName(gameInfo->variant), MAX_FIELD_LEN );
             break;
         case GLT_OUT_OF_BOOK:
             strncpy( buf, gameInfo->outOfBook ? gameInfo->outOfBook : "?", MAX_FIELD_LEN );