Index: draw_fontsel.c
===================================================================
--- draw_fontsel.c	(revision 36684)
+++ draw_fontsel.c	(revision 36685)
@@ -110,7 +110,7 @@
 font_coord_t font_coord[MAX_FONT];
 int font_coords;
 
-static void pcb_draw_font(rnd_hid_gc_t gc, pcb_font_t *f, int x, int *y, pcb_text_t *txt, rnd_font_id_t *dst_fid)
+static void pcb_draw_font(rnd_hid_gc_t gc, rnd_font_t *f, int x, int *y, pcb_text_t *txt, rnd_font_id_t *dst_fid)
 {
 	char buf[256];
 	pcb_text_t *t;
@@ -125,14 +125,14 @@
 	else
 	target_fid = conf_core.design.text_font_id;
 
-	nm = (f->rnd_font.name == NULL) ? "<anonymous>" : f->rnd_font.name;
-	rnd_snprintf(buf, sizeof(buf), "#%d [abc ABC 123] %s", f->rnd_font.id, nm);
+	nm = (f->name == NULL) ? "<anonymous>" : f->name;
+	rnd_snprintf(buf, sizeof(buf), "#%d [abc ABC 123] %s", f->id, nm);
 
-	dchkbox(gc, x-4, *y, (f->rnd_font.id == target_fid));
+	dchkbox(gc, x-4, *y, (f->id == target_fid));
 
 	rnd_render->set_color(gc, BLACK);
-	t = dtext(x, *y, 200, f->rnd_font.id, buf);
-	pcb_text_bbox(pcb_font(PCB, f->rnd_font.id, 1), t);
+	t = dtext(x, *y, 200, f->id, buf);
+	pcb_text_bbox(pcb_font(PCB, f->id, 1), t);
 
 	*y += rnd_round(RND_COORD_TO_MM(t->BoundingBox.Y2 - t->BoundingBox.Y1) + 0.5);
 
@@ -139,7 +139,7 @@
 	if (font_coords < MAX_FONT) {
 		font_coord[font_coords].y1 = y_old;
 		font_coord[font_coords].y2 = *y;
-		font_coord[font_coords].fid = f->rnd_font.id;
+		font_coord[font_coords].fid = f->id;
 		font_coords++;
 	}
 }
@@ -150,7 +150,7 @@
 	int y = 0;
 
 	font_coords = 0;
-	pcb_draw_font(gc, &PCB->fontkit.dflt, 0, &y, txt, dst_fid);
+	pcb_draw_font(gc, &PCB->fontkit.dflt.rnd_font, 0, &y, txt, dst_fid);
 
 	if (PCB->fontkit.hash_inited) {
 		htip_entry_t *e;