updated for version 7.4.252

Problem:    Critical error in GTK, removing timer twice.
Solution:   Clear the timer after removing it. (James McCoy)

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 05295bf08486b1ccb38b168cf8dce36e717b23d3..1cb47b44b0cf60339de690973719b8bfb9268189 100644 (file)
--- 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 b74ea983c7d0cab50c0a83ea5d7c2275c333715a..f0ef62c7e212ace67ae7da5039de119cb930f679 100644 (file)
--- 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,
 /**/