From 7bcdb7d1669b0a37cd86446dab0c66f2e1971fa7 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 6 Apr 2014 21:08:45 +0200 Subject: [PATCH] updated for version 7.4.252 Problem: Critical error in GTK, removing timer twice. Solution: Clear the timer after removing it. (James McCoy) --- src/gui_gtk_x11.c | 3 +++ src/version.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index 05295bf084..1cb47b44b0 100644 --- 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) { diff --git a/src/version.c b/src/version.c index b74ea983c7..f0ef62c7e2 100644 --- a/src/version.c +++ b/src/version.c @@ -734,6 +734,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 252, /**/ 251, /**/