aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/main.c
diff options
context:
space:
mode:
authorbfredl <bjorn.linse@gmail.com>2023-01-05 10:41:14 +0100
committerGitHub <noreply@github.com>2023-01-05 10:41:14 +0100
commit85eb564bac167c63eadbd6136406ac4863ee30ee (patch)
tree79a1d81956d87986467e4da70b4f9ad53b079040 /src/nvim/main.c
parentae64772a88125153a438a0e9e43d5f6bcb4eeb28 (diff)
parent47ba78f89a1f0bba8168b4408bc55a3024d5ab97 (diff)
downloadrneovim-85eb564bac167c63eadbd6136406ac4863ee30ee.tar.gz
rneovim-85eb564bac167c63eadbd6136406ac4863ee30ee.tar.bz2
rneovim-85eb564bac167c63eadbd6136406ac4863ee30ee.zip
Merge pull request #21605 from bfredl/uidvp
The UI Devirtualization Project
Diffstat (limited to 'src/nvim/main.c')
-rw-r--r--src/nvim/main.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c
index b5207f9cf6..b0da7f4500 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -627,11 +627,13 @@ void os_exit(int r)
{
exiting = true;
- if (!ui_client_channel_id) {
+ if (ui_client_channel_id) {
+ ui_client_stop();
+ } else {
ui_flush();
+ ui_call_stop();
+ ml_close_all(true); // remove all memfiles
}
- ui_call_stop();
- ml_close_all(true); // remove all memfiles
if (!event_teardown() && r == 0) {
r = 1; // Exit with error if main_loop did not teardown gracefully.