changeset 5818:a43a8262e1ce v7.4.252

updated for version 7.4.252 Problem: Critical error in GTK, removing timer twice. Solution: Clear the timer after removing it. (James McCoy)
author Bram Moolenaar <bram@vim.org>
date Sun, 06 Apr 2014 21:08:45 +0200
parents ee674aaf65a4
children 33629aae4090
files src/gui_gtk_x11.c src/version.c
diffstat 2 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -732,7 +732,10 @@ blink_cb(gpointer data UNUSED)
 gui_mch_start_blink(void)
 {
     if (blink_timer)
+    {
 	gtk_timeout_remove(blink_timer);
+	blink_timer = 0;
+    }
     /* Only switch blinking on if none of the times is zero */
     if (blink_waittime && blink_ontime && blink_offtime && gui.in_focus)
     {
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    252,
+/**/
     251,
 /**/
     250,