Patch 8.2.1774

5 views
Skip to first unread message

Bram Moolenaar

unread,
Sep 29, 2020, 4:16:53 PM9/29/20
to vim...@googlegroups.com

Patch 8.2.1774
Problem: GTK: hang when forced to exit.
Solution: Do not clean up "mainwin" when really_exiting is set.
(Zdenek Dohnal, closes #7042)
Files: src/gui_gtk_x11.c


*** ../vim-8.2.1773/src/gui_gtk_x11.c 2020-09-09 19:05:10.144182520 +0200
--- src/gui_gtk_x11.c 2020-09-29 22:02:43.141233994 +0200
***************
*** 4381,4391 ****
return OK;
}

!
void
gui_mch_exit(int rc UNUSED)
{
! if (gui.mainwin != NULL)
gtk_widget_destroy(gui.mainwin);
}

--- 4381,4394 ----
return OK;
}

! /*
! * Clean up for when exiting Vim.
! */
void
gui_mch_exit(int rc UNUSED)
{
! // Clean up, unless we don't want to invoke free().
! if (gui.mainwin != NULL && !really_exiting)
gtk_widget_destroy(gui.mainwin);
}

*** ../vim-8.2.1773/src/version.c 2020-09-29 21:45:37.524570542 +0200
--- src/version.c 2020-09-29 22:14:59.573926732 +0200
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 1774,
/**/

--
hundred-and-one symptoms of being an internet addict:
22. You've already visited all the links at Yahoo and you're halfway through
Lycos.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Reply all
Reply to author
Forward
0 new messages