diff options
author | Bram Moolenaar <Bram@vim.org> | 2014-04-06 21:08:45 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2014-04-06 21:08:45 +0200 |
commit | 7bcdb7d1669b0a37cd86446dab0c66f2e1971fa7 (patch) | |
tree | 8a58cb2f2cbdfc1952cf1b31fa843a1222ab1e92 | |
parent | 4c7ab1bb5722de662db04550b74256671f20c4a2 (diff) |
updated for version 7.4.252v7.4.252
Problem: Critical error in GTK, removing timer twice.
Solution: Clear the timer after removing it. (James McCoy)
-rw-r--r-- | src/gui_gtk_x11.c | 3 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 0 deletions
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 @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 252, +/**/ 251, /**/ 250, |