Mercurial > vim

diff src/gui_x11.c @ 13152:f4c3a7f410f4 v8.0.1450

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.1450: GUI: endless loop when stopping cursor blinking commit https://github.com/vim/vim/commit/1dd45fb4f3371f0256653b2186c8b4b3d26b3f41 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Jan 31 21:10:01 2018 +0100 patch 8.0.1450: GUI: endless loop when stopping cursor blinking Problem: Endless loop when gui_mch_stop_blink() is called while blink_state is BLINK_OFF. (zdohnal) Solution: Avoid calling gui_update_cursor() recursively.
author Christian Brabandt <cb@256bit.org>
date Wed, 31 Jan 2018 21:15:05 +0100
parents 1a450ce6980c
children ac42c4b11dbc
line wrap: on
line diff
--- a/src/gui_x11.c
+++ b/src/gui_x11.c
@@ -2746,7 +2746,7 @@ gui_mch_wait_for_chars(long wtime)
 	    if (gui.in_focus)
 		gui_mch_start_blink();
 	    else
-		gui_mch_stop_blink();
+		gui_mch_stop_blink(TRUE);
 	    focus = gui.in_focus;
 	}
 
@@ -3105,14 +3105,14 @@ gui_mch_set_blinking(long waittime, long
  * Stop the cursor blinking.  Show the cursor if it wasn't shown.
  */
     void
-gui_mch_stop_blink(void)
+gui_mch_stop_blink(int may_call_gui_update_cursor)
 {
     if (blink_timer != (XtIntervalId)0)
     {
 	XtRemoveTimeOut(blink_timer);
 	blink_timer = (XtIntervalId)0;
     }
-    if (blink_state == BLINK_OFF)
+    if (blink_state == BLINK_OFF && may_call_gui_update_cursor)
 	gui_update_cursor(TRUE, FALSE);
     blink_state = BLINK_NONE;
 }