summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gui_gtk_x11.c7
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 2 deletions
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
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1774,
+/**/
1773,
/**/
1772,