X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=704847e94f677c7c4d9a77d45dd40e4e44e7dde4;hb=6a003377fa02454a3d4bf200b5cb11b1dee097fb;hp=3c21f9dec73f86411a2ff30766a6435944094767;hpb=22dd9bcd6ae74b6206a606e617286f4277eb801c;p=xboard.git

diff --git a/backend.c b/backend.c
index 3c21f9d..704847e 100644
--- a/backend.c
+++ b/backend.c
@@ -131,9 +131,16 @@ extern int gettimeofday(struct timeval *, struct timezone *);
 #ifdef ENABLE_NLS 
 # define _(s) gettext (s) 
 # define N_(s) gettext_noop (s) 
+# define T_(s) gettext(s)
 #else 
-# define _(s) (s) 
-# define N_(s) s 
+# ifdef WIN32
+#   define _(s) T_(s)
+#   define N_(s) s
+# else
+#   define _(s) (s) 
+#   define N_(s) s 
+#   define T_(s) s
+# endif
 #endif 
 
 
@@ -714,8 +721,8 @@ InitBackEnd1()
     /* [AS] Adjudication threshold */
     adjudicateLossThreshold = appData.adjudicateLossThreshold;
     
-    first.which = "first";
-    second.which = "second";
+    first.which = _("first");
+    second.which = _("second");
     first.maybeThinking = second.maybeThinking = FALSE;
     first.pr = second.pr = NoProc;
     first.isr = second.isr = NULL;
@@ -9366,7 +9373,12 @@ GameEnds(result, resultDetails, whosays)
     gameMode = nextGameMode;
     ModeHighlight();
     endingGame = 0;  /* [HGM] crash */
-    if(popupRequested) DisplayFatalError(buf, 0, 0); // [HGM] crash: this call GameEnds recursively through ExitEvent! Make it a harmless tail recursion.
+    if(popupRequested) { // [HGM] crash: this calls GameEnds recursively through ExitEvent! Make it a harmless tail recursion.
+      if(matchMode == TRUE) DisplayFatalError(buf, 0, 0); else {
+	matchMode = FALSE; appData.matchGames = matchGame = 0;
+	DisplayNote(buf);
+      }
+    }
 }
 
 /* Assumes program was just initialized (initString sent).
@@ -14002,7 +14014,7 @@ DisplayMove(moveNumber)
 	    sprintf(res, " %s", PGNResult(gameInfo.result));
 	} else {
 	    sprintf(res, " {%s} %s",
-		    gameInfo.resultDetails, PGNResult(gameInfo.result));
+		    T_(gameInfo.resultDetails), PGNResult(gameInfo.result));
 	}
     } else {
 	res[0] = NULLCHAR;