From 7223973988ae6cff1888ef899a191d1885b7af43 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Mon, 23 Sep 2013 14:35:08 +0000
Subject: [PATCH] Fix cut-and-paste errors in nonfatal() implementations.

Unix GUI programs should not say 'Fatal Error' in the message box
title, and Plink should not destroy its logging context as a side
effect of printing a non-fatal error. Both appear to have been due to
inattentive cut and paste from the pre-existing fatal error functions.

[originally from svn r10044]
---
 unix/gtkdlg.c      | 2 +-
 unix/uxplink.c     | 4 ----
 windows/winplink.c | 4 ----
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index 053c6210..4b640443 100644
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -3415,7 +3415,7 @@ void nonfatal(char *p, ...)
     va_start(ap, p);
     msg = dupvprintf(p, ap);
     va_end(ap);
-    fatal_message_box(NULL, msg);
+    nonfatal_message_box(NULL, msg);
     sfree(msg);
 }
 
diff --git a/unix/uxplink.c b/unix/uxplink.c
index ee5cef8a..87efe78a 100644
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -74,10 +74,6 @@ void nonfatal(char *p, ...)
     va_end(ap);
     fputc('\n', stderr);
     postmsg(&cf);
-    if (logctx) {
-        log_free(logctx);
-        logctx = NULL;
-    }
 }
 void connection_fatal(void *frontend, char *p, ...)
 {
diff --git a/windows/winplink.c b/windows/winplink.c
index a618c7ed..5849e0d4 100644
--- a/windows/winplink.c
+++ b/windows/winplink.c
@@ -57,10 +57,6 @@ void nonfatal(char *p, ...)
     vfprintf(stderr, p, ap);
     va_end(ap);
     fputc('\n', stderr);
-    if (logctx) {
-        log_free(logctx);
-        logctx = NULL;
-    }
 }
 void connection_fatal(void *frontend, char *p, ...)
 {