Tentative merge of ben-mac-port (only dead for three years!) into the trunk.

[u/mdw/putty] / settings.c

diff --git a/settings.c b/settings.c
index 833a10d..9530b4a 100644 (file)
--- 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) {