0
0
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00

updated for version 7.4.252

Problem:    Critical error in GTK, removing timer twice.
Solution:   Clear the timer after removing it. (James McCoy)
This commit is contained in:
Bram Moolenaar
2014-04-06 21:08:45 +02:00
parent 4c7ab1bb57
commit 7bcdb7d166
2 changed files with 5 additions and 0 deletions

View File

@@ -732,7 +732,10 @@ blink_cb(gpointer data UNUSED)
gui_mch_start_blink(void) gui_mch_start_blink(void)
{ {
if (blink_timer) if (blink_timer)
{
gtk_timeout_remove(blink_timer); gtk_timeout_remove(blink_timer);
blink_timer = 0;
}
/* Only switch blinking on if none of the times is zero */ /* Only switch blinking on if none of the times is zero */
if (blink_waittime && blink_ontime && blink_offtime && gui.in_focus) if (blink_waittime && blink_ontime && blink_offtime && gui.in_focus)
{ {

View File

@@ -734,6 +734,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
252,
/**/ /**/
251, 251,
/**/ /**/