From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 29 Sep 2020 20:16:09 +0000 (+0200)
Subject: patch 8.2.1774: GTK: hang when forced to exit
X-Git-Tag: v8.2.1774
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=32fbc4f247a31e35ade0939542e11aa033a2554f;p=thirdparty%2Fvim.git

patch 8.2.1774: GTK: hang when forced to exit

Problem:    GTK: hang when forced to exit.
Solution:   Do not clean up "mainwin" when really_exiting is set.
            (Zdenek Dohnal, closes #7042)
---

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index fe1ac58782..ecd2d887fc 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -4381,11 +4381,14 @@ gui_mch_open(void)
     return OK;
 }
 
-
+/*
+ * Clean up for when exiting Vim.
+ */
     void
 gui_mch_exit(int rc UNUSED)
 {
-    if (gui.mainwin != NULL)
+    // Clean up, unless we don't want to invoke free().
+    if (gui.mainwin != NULL && !really_exiting)
 	gtk_widget_destroy(gui.mainwin);
 }
 
diff --git a/src/version.c b/src/version.c
index acac541feb..550296687d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1774,
 /**/
     1773,
 /**/