X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/820934c1774e4a0f9a54a8e1d704cc6f63e2fe8b..9694f3718219a388edcf672fa0a663298bd2475c:/unix/gtkwin.c

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 76f78f69..5aeeaf02 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -155,6 +155,8 @@ Filename platform_default_filename(const char *name)
 
 char *platform_default_s(const char *name)
 {
+    if (!strcmp(name, "SerialLine"))
+	return dupstr("/dev/ttyS0");
     return NULL;
 }
 
@@ -1996,12 +1998,18 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
 	    wcs[i] = text[i];
 	}
 
+	if (inst->fonts[fontid] == NULL && (fontid & 2)) {
+	    /*
+	     * We've been given ATTR_WIDE, but have no wide font.
+	     * Fall back to the non-wide font.
+	     */
+	    fontid &= ~2;
+	}
+
 	if (inst->fonts[fontid] == NULL) {
 	    /*
-	     * The font for this contingency does not exist.
-	     * Typically this means we've been given ATTR_WIDE
-	     * character and have no wide font. So we display
-	     * nothing at all; such is life.
+	     * The font for this contingency does not exist. So we
+	     * display nothing at all; such is life.
 	     */
 	} else if (inst->fontinfo[fontid].is_wide) {
 	    /*
@@ -3444,7 +3452,7 @@ int pt_main(int argc, char **argv)
 
 	cmdline_run_saved(&inst->cfg);
 
-	if (!*inst->cfg.host && !cfgbox(&inst->cfg))
+	if (!cfg_launchable(&inst->cfg) && !cfgbox(&inst->cfg))
 	    exit(0);		       /* config box hit Cancel */
     }