updated for version 7.4.252

brammool · brammool · commit 54eaa17f8ebc · 2014-04-06T21:08:45.000+02:00
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
@@ -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
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    252,
 /**/
     251,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -732,7 +732,10 @@ blink_cb(gpointer data UNUSED)`
`732`	`732`	`gui_mch_start_blink(void)`
`733`	`733`	`{`
`734`	`734`	`if (blink_timer)`
	`735`	`+ {`
`735`	`736`	`gtk_timeout_remove(blink_timer);`
	`737`	`+ blink_timer = 0;`
	`738`	`+ }`
`736`	`739`	`/* Only switch blinking on if none of the times is zero */`
`737`	`740`	`if (blink_waittime && blink_ontime && blink_offtime && gui.in_focus)`
`738`	`741`	`{`