Permalink
Browse files

patch 8.0.0637: crash when using some version of GTK 3

Problem:    Crash when using some version of GTK 3.
Solution:   Add #ifdefs around incrementing the menu index. (Kazunobu
            Kuriyama)
  • Loading branch information...
brammool committed Jun 13, 2017
1 parent 56f2db5 commit 21b34b63b3f63dd54b338c4433fa7117dad9507b
Showing with 6 additions and 0 deletions.
  1. +4 −0 src/gui_gtk.c
  2. +2 −0 src/version.c
View
@@ -652,9 +652,11 @@ gui_mch_add_menu(vimmenu_T *menu, int idx)
parent_widget = (parent != NULL) ? parent->submenu_id : gui.menubar;
menu_item_new(menu, parent_widget);
# if !GTK_CHECK_VERSION(3,4,0)
/* since the tearoff should always appear first, increment idx */
if (parent != NULL && !menu_is_popup(parent->name))
++idx;
# endif
gtk_menu_shell_insert(GTK_MENU_SHELL(parent_widget), menu->id, idx);
@@ -773,10 +775,12 @@ gui_mch_add_menu_item(vimmenu_T *menu, int idx)
if (parent == NULL || parent->submenu_id == NULL)
return;
# if !GTK_CHECK_VERSION(3,4,0)
/* Make place for the possible tearoff handle item. Not in the popup
* menu, it doesn't have a tearoff item. */
if (!menu_is_popup(parent->name))
++idx;
# endif
if (menu_is_separator(menu->name))
{
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
637,
/**/
636,
/**/

0 comments on commit 21b34b6

Please sign in to comment.