From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 23 May 2022 12:28:00 +0000 (-0400)
Subject: Remove an assertion that we hit
X-Git-Tag: archive/raspbian/4.8.3+ds-2+rpi1~3^2~20^2~4^2~170^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b3e65bfdc10fa9ac1a5763084106f7eda520876f;p=gtk4.git

Remove an assertion that we hit

It appears that we mess up accounting for blinking
cursors sometimes, and can hit blink_cb when there
is a nonempty selection.

Instead of asserting, warn and stop blinking.

Related: #4767
---

diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 6bbb6b3098..92903949fe 100644
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -6535,7 +6535,13 @@ blink_cb (GtkWidget     *widget,
       return G_SOURCE_REMOVE;
     }
 
-  g_assert (priv->selection_bound == priv->current_pos);
+  if (priv->selection_bound != priv->current_pos)
+    {
+      g_warning ("GtkText - unexpected blinking selection. Removing");
+
+      gtk_text_check_cursor_blink (self);
+      return G_SOURCE_REMOVE;
+    }
 
   blink_timeout = get_cursor_blink_timeout (self);
   blink_time = get_cursor_time (self);