Deal with the possibility of no valid font being selected at all

[PuTTY.git] / unix / gtkfont.c

diff --git a/unix/gtkfont.c b/unix/gtkfont.c
index b5c31cfa5bbc68ab17b6dbbdbbf71ce79f9b89ee..cc655622f9d70b985279a0b3f0b9aeba85e0dbb9 100644 (file)
--- a/unix/gtkfont.c
+++ b/unix/gtkfont.c
@@ -1564,6 +1564,8 @@ static void unifontsel_select_font(unifontsel_internal *fs,
     if (size_is_explicit)
        fs->intendedsize = size;
 
+    gtk_widget_set_sensitive(fs->u.ok_button, TRUE);
+
     /*
      * Find the index of this fontinfo in the selorder list. 
      */
@@ -2270,6 +2272,8 @@ unifontsel *unifontsel_new(const char *wintitle)
     unifontsel_setup_familylist(fs);
 
     fs->selected = NULL;
+    fs->selsize = fs->intendedsize = 13;   /* random default */
+    gtk_widget_set_sensitive(fs->u.ok_button, FALSE);
 
     return (unifontsel *)fs;
 }
@@ -2349,7 +2353,8 @@ char *unifontsel_get_name(unifontsel *fontsel)
     unifontsel_internal *fs = (unifontsel_internal *)fontsel;
     char *name;
 
-    assert(fs->selected);
+    if (!fs->selected)
+       return NULL;
 
     if (fs->selected->size == 0) {
        name = fs->selected->fontclass->scale_fontname