aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-18 07:54:29 -04:00
Code Activity

patch 8.0.1450: GUI: endless loop when stopping cursor blinking

Browse Source 
Problem:    Endless loop when gui_mch_stop_blink() is called while blink_state
            is BLINK_OFF. (zdohnal)
Solution:   Avoid calling gui_update_cursor() recursively.
This commit is contained in:
Bram Moolenaar
2018-01-31 21:10:01 +01:00
parent a338adcf22
commit 1dd45fb4f3
12 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui_x11.c
View File

@@ -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 on, long off)
* 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;
}