X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/623f81b71eb7e64412adce7cbc1f0d0141f20f51..7d22c2e8c8e4104bcd39f35ebeaa5f81edd374cf:/settings.c?ds=sidebyside

diff --git a/settings.c b/settings.c
index 833a10d2..9530b4ae 100644
--- a/settings.c
+++ b/settings.c
@@ -484,6 +484,8 @@ void load_settings(char *section, int do_host, Config * cfg)
     gppi(sesskey, "TermHeight", 24, &cfg->height);
 #ifdef _WINDOWS
     gpps(sesskey, "Font", "Courier New", cfg->font, sizeof(cfg->font));
+#elif defined(macintosh)
+    gpps(sesskey, "Font", "Monaco", cfg->font, sizeof(cfg->font));
 #else
     gpps(sesskey, "Font", "fixed", cfg->font, sizeof(cfg->font));
 #endif
@@ -670,7 +672,7 @@ void get_sesslist(struct sesslist *list, int allocate)
 
 	buflen = bufsize = 0;
 	list->buffer = NULL;
-	if ((handle = enum_settings_start())) {
+	if ((handle = enum_settings_start()) != NULL) {
 	    do {
 		ret = enum_settings_next(handle, otherbuf, sizeof(otherbuf));
 		if (ret) {