# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1601411404 -7200
# Node ID 3845389725c9683d67afdac6c87ff7089db9f009
# Parent  9e097eb15d542cc05ef7e1bcd1ede0bcf79b2115
patch 8.2.1774: GTK: hang when forced to exit

Commit: https://github.com/vim/vim/commit/32fbc4f247a31e35ade0939542e11aa033a2554f
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Sep 29 22:16:09 2020 +0200

    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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1774,
+/**/
     1773,
 /**/
     1772,