From: H.G.Muller <hgm@hgm-xboard.(none)>
Date: Wed, 6 Apr 2016 14:44:13 +0000 (+0200)
Subject: Fix history/eng.out font setting on sizing and other bug
X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=4d07dad6e499b01a9dfa75c947558cd15972c49e;p=xboard.git

Fix history/eng.out font setting on sizing and other bug

The coord font was set with the historyFont value, and when a valid
font was taken from the fontTable, fontIsSet was not set.
---

diff --git a/gtk/xboard.c b/gtk/xboard.c
index ad3cd5a..e8d5178 100644
--- a/gtk/xboard.c
+++ b/gtk/xboard.c
@@ -449,7 +449,7 @@ ChangeFont (int force, char **font, int fnr, int size, char *def, int pix)
 	if(fontIsSet[fnr] && !force) return; // unless forced we do not replace an explicitly specified font by a default
 	ASSIGN(fontTable[fnr][size], def);   // use default
 	fontIsSet[fnr] = False;
-    }
+    } else fontIsSet[fnr] = True;
     FREE(*font); *font = InsertPxlSize(fontTable[fnr][size], pix);
 }
 
@@ -1710,7 +1710,7 @@ ReSize (WindowPlacement *wp)
 	    ChangeFont(0, &appData.tagsFont, EDITTAGS_FONT, initialSquareSize, TAGS_FONT_NAME, sizeDefaults[h].coordFontPxlSize);
 	    ChangeFont(0, &appData.commentFont, COMMENT_FONT, initialSquareSize, COMMENT_FONT_NAME, sizeDefaults[h].coordFontPxlSize);
 	    ChangeFont(0, &appData.gameListFont, GAMELIST_FONT, initialSquareSize, GAMELIST_FONT_NAME, sizeDefaults[h].coordFontPxlSize);
-	    ChangeFont(0, &appData.coordFont, MOVEHISTORY_FONT, initialSquareSize, HISTORY_FONT_NAME, sizeDefaults[h].coordFontPxlSize);
+	    ChangeFont(0, &appData.historyFont, MOVEHISTORY_FONT, initialSquareSize, HISTORY_FONT_NAME, sizeDefaults[h].coordFontPxlSize);
 	    DisplayBothClocks();
 	    ApplyFont(&mainOptions[W_MESSG], NULL);
 	    for(i=1; i<6; i++) ApplyFont(&mainOptions[W_BUTTON+i], NULL);