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 | fcca1a296fbc64c836e9df77cc954bc208b7435b (patch) | |
| tree | e7eddfb9da51ea0389edeb0d6284511b69819a22 | |
| parent | 753f5bd4daad2f454275e545bf2656d67f360ff4 (diff) | |
| download | vim-fcca1a296fbc64c836e9df77cc954bc208b7435b.tar.gz | |
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 05295bf0..1cb47b44 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 b74ea983..f0ef62c7 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, |