Amiga: Set default fonts just before font init

Ensures the correct font types are applied

Author: chris-y

frontends/amiga/font.c

@@ -109,8 +109,30 @@ void ami_font_close_disk_font(struct TextFont *tfont)
 void ami_font_init(void)
 {
 	if(nsoption_bool(bitmap_fonts) == false) {
+#ifdef __amigaos4__
+		nsoption_setnull_charp(font_sans, (char *)strdup("DejaVu Sans"));
+		nsoption_setnull_charp(font_serif, (char *)strdup("DejaVu Serif"));
+		nsoption_setnull_charp(font_mono, (char *)strdup("DejaVu Sans Mono"));
+		nsoption_setnull_charp(font_cursive, (char *)strdup("DejaVu Sans"));
+		nsoption_setnull_charp(font_fantasy, (char *)strdup("DejaVu Serif"));
+#else
+		/* Default CG fonts for OS3 - these work with use_diskfont both on and off,
+		however they are slow in both cases. The bitmap fonts don't work when
+		use_diskfont is off. */
+		nsoption_setnull_charp(font_sans, (char *)strdup("CGTriumvirate"));
+		nsoption_setnull_charp(font_serif, (char *)strdup("CGTimes"));
+		nsoption_setnull_charp(font_mono, (char *)strdup("LetterGothic"));
+		nsoption_setnull_charp(font_cursive, (char *)strdup("CGTriumvirate"));
+		nsoption_setnull_charp(font_fantasy, (char *)strdup("CGTimes"));
+#endif
 		ami_font_bullet_init();
 	} else {
+		nsoption_setnull_charp(font_sans, (char *)strdup("helvetica"));
+		nsoption_setnull_charp(font_serif, (char *)strdup("times"));
+		nsoption_setnull_charp(font_mono, (char *)strdup("topaz"));
+		nsoption_setnull_charp(font_cursive, (char *)strdup("garnet"));
+		nsoption_setnull_charp(font_fantasy, (char *)strdup("emerald"));
+
 		ami_font_diskfont_init();
 	}
 }

frontends/amiga/gui.c

@@ -1110,32 +1110,7 @@ static nserror ami_set_options(struct nsoption_s *defaults)
 	nsoption_setnull_charp(ca_bundle,
 			       (char *)strdup("PROGDIR:Resources/ca-bundle"));
 
-	/* font defaults */
-
-	if(nsoption_bool(bitmap_fonts) == false) {
-#ifdef __amigaos4__
-		nsoption_setnull_charp(font_sans, (char *)strdup("DejaVu Sans"));
-		nsoption_setnull_charp(font_serif, (char *)strdup("DejaVu Serif"));
-		nsoption_setnull_charp(font_mono, (char *)strdup("DejaVu Sans Mono"));
-		nsoption_setnull_charp(font_cursive, (char *)strdup("DejaVu Sans"));
-		nsoption_setnull_charp(font_fantasy, (char *)strdup("DejaVu Serif"));
-#else
-		/* Default CG fonts for OS3 - these work with use_diskfont both on and off,
-		however they are slow in both cases. The bitmap fonts don't work when
-		use_diskfont is off. */
-		nsoption_setnull_charp(font_sans, (char *)strdup("CGTriumvirate"));
-		nsoption_setnull_charp(font_serif, (char *)strdup("CGTimes"));
-		nsoption_setnull_charp(font_mono, (char *)strdup("LetterGothic"));
-		nsoption_setnull_charp(font_cursive, (char *)strdup("CGTriumvirate"));
-		nsoption_setnull_charp(font_fantasy, (char *)strdup("CGTimes"));
-#endif
-	} else {
-		nsoption_setnull_charp(font_sans, (char *)strdup("helvetica"));
-		nsoption_setnull_charp(font_serif, (char *)strdup("times"));
-		nsoption_setnull_charp(font_mono, (char *)strdup("topaz"));
-		nsoption_setnull_charp(font_cursive, (char *)strdup("garnet"));
-		nsoption_setnull_charp(font_fantasy, (char *)strdup("emerald"));
-	}
+	/* Regular font defaults are set in font.c */
 
 	if (nsoption_charp(font_unicode) == NULL)
 	{