aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2023-01-03 17:21:42 +0800
committerGitHub <noreply@github.com>2023-01-03 17:21:42 +0800
commitc3d8665851c20414007f04a481c5a542d9d139f2 (patch)
tree48992e4478b273e7f82648d65e0d15ce3eab52f8
parent4dd793a256fefb481159f9f93bf7572391e266de (diff)
downloadrneovim-c3d8665851c20414007f04a481c5a542d9d139f2.tar.gz
rneovim-c3d8665851c20414007f04a481c5a542d9d139f2.tar.bz2
rneovim-c3d8665851c20414007f04a481c5a542d9d139f2.zip
fix(exit): the TUI should not ui_flush() itself (#21625)
-rw-r--r--src/nvim/main.c4
-rw-r--r--src/nvim/ui.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c
index c20be202e8..b5207f9cf6 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -627,7 +627,9 @@ void os_exit(int r)
{
exiting = true;
- ui_flush();
+ if (!ui_client_channel_id) {
+ ui_flush();
+ }
ui_call_stop();
ml_close_all(true); // remove all memfiles
diff --git a/src/nvim/ui.c b/src/nvim/ui.c
index 33c7d0c1fe..4c640693cc 100644
--- a/src/nvim/ui.c
+++ b/src/nvim/ui.c
@@ -506,6 +506,7 @@ handle_T ui_cursor_grid(void)
void ui_flush(void)
{
+ assert(!ui_client_channel_id);
if (!ui_active()) {
return;
}