rm some magic numbers in ssh_setup_portfwd()

[PuTTY.git] / mac / macterm.c

diff --git a/mac/macterm.c b/mac/macterm.c
index 22360e146d97bce0a1616af3985df84d911aa54e..d5a6014d1a2b258ab1541d6632916de6aff2f5cf 100644 (file)
--- a/mac/macterm.c
+++ b/mac/macterm.c
@@ -1015,7 +1015,7 @@ void mac_closeterm(WindowPtr window)
     int alertret;
     Session *s = mac_windowsession(window);
 
-    if (s->cfg.warn_on_close) {
+    if (s->cfg.warn_on_close && !s->session_closed) {
        ParamText("\pAre you sure you want to close this session?",
                  NULL, NULL, NULL);
        alertret=CautionAlert(wQuestion, NULL);
@@ -1028,8 +1028,10 @@ void mac_closeterm(WindowPtr window)
     HideWindow(s->window);
     *s->prev = s->next;
     s->next->prev = s->prev;
-    ldisc_free(s->ldisc);
-    s->back->free(s->backhandle);
+    if (s->ldisc)
+       ldisc_free(s->ldisc);
+    if (s->back)
+       s->back->free(s->backhandle);
     log_free(s->logctx);
     if (s->uni_to_font != NULL)
        DisposeUnicodeToTextInfo(&s->uni_to_font);