Put fonts in font table in allocated memory after sizing

[xboard.git] / gtk / xboard.c

diff --git a/gtk/xboard.c b/gtk/xboard.c
index 3cac488..c6579d8 100644 (file)
--- a/gtk/xboard.c
+++ b/gtk/xboard.c
@@ -1693,9 +1693,9 @@ ReSize (WindowPlacement *wp)
        for(h=0; sizeDefaults[h].name && sizeDefaults[h].squareSize*8 > sqx*BOARD_WIDTH; h++) {}
        if(initialSquareSize != sizeDefaults[h].squareSize) { // boardSize changed
            initialSquareSize = sizeDefaults[h].squareSize; // used for saving font
-           if(!fontValid[CLOCK_FONT][initialSquareSize]) fontTable[CLOCK_FONT][initialSquareSize] = CLOCK_FONT_NAME;
+           if(!fontValid[CLOCK_FONT][initialSquareSize]) { ASSIGN(fontTable[CLOCK_FONT][initialSquareSize], CLOCK_FONT_NAME); }
            appData.clockFont = InsertPxlSize(fontTable[CLOCK_FONT][initialSquareSize], 2*(sizeDefaults[h].clockFontPxlSize+1)/3);
-           if(!fontValid[MESSAGE_FONT][initialSquareSize]) fontTable[MESSAGE_FONT][initialSquareSize] = DEFAULT_FONT_NAME;
+           if(!fontValid[MESSAGE_FONT][initialSquareSize]) { ASSIGN(fontTable[MESSAGE_FONT][initialSquareSize], DEFAULT_FONT_NAME); }
            appData.font = InsertPxlSize(fontTable[MESSAGE_FONT][initialSquareSize], sizeDefaults[h].coordFontPxlSize);
            DisplayBothClocks();
            ApplyFont(&mainOptions[W_MESSG], NULL);
@@ -1704,6 +1704,7 @@ ReSize (WindowPlacement *wp)
        if(!strchr(appData.boardSize, ',')) {
            ASSIGN(appData.boardSize, sizeDefaults[h].name);
        }
+#ifndef OSXAPP
        if(sizeDefaults[h].tinyLayout != tinyLayout) { // alter clipping of menu names to conform to board width
            int clip = (tinyLayout = sizeDefaults[h].tinyLayout) + 1;
            char text[MSG_SIZ];
@@ -1713,6 +1714,7 @@ ReSize (WindowPlacement *wp)
                gtk_menu_item_set_label((GtkMenuItem *) mainOptions[h].handle, text);
            }
        }
+#endif
        if(sqx != squareSize && !first) {
            squareSize = sqx; // adopt new square size
            CreatePNGPieces(); // make newly scaled pieces