diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2018-02-22 09:00:21 +0100 |
|---|---|---|
| committer | Björn Linse <bjorn.linse@gmail.com> | 2018-02-22 10:26:45 +0100 |
| commit | 8b05da157728e960b15c7e719a20eedb61637703 (patch) | |
| tree | dad03f3f84c5ea7d1ecaeb2c56482cfbfb719e38 /src/nvim/ui_bridge.c | |
| parent | 4696a5a10e16ca5c571e6b69248c5a8ee9685fda (diff) | |
| download | rneovim-8b05da157728e960b15c7e719a20eedb61637703.tar.gz rneovim-8b05da157728e960b15c7e719a20eedb61637703.tar.bz2 rneovim-8b05da157728e960b15c7e719a20eedb61637703.zip | |
ui_bridge: make sure TUI receives no more UI events after "stop" event
Diffstat (limited to 'src/nvim/ui_bridge.c')
| -rw-r--r-- | src/nvim/ui_bridge.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/nvim/ui_bridge.c b/src/nvim/ui_bridge.c index c936a17e52..56e0c0c454 100644 --- a/src/nvim/ui_bridge.c +++ b/src/nvim/ui_bridge.c @@ -106,6 +106,9 @@ static void ui_thread_run(void *data) static void ui_bridge_stop(UI *b) { + // Detach brigde first, so that "stop" is the last event the TUI loop + // receives from the main thread. #8041 + ui_detach_impl(b); UIBridgeData *bridge = (UIBridgeData *)b; bool stopped = bridge->stopped = false; UI_BRIDGE_CALL(b, stop, 1, b); @@ -122,7 +125,6 @@ static void ui_bridge_stop(UI *b) uv_mutex_destroy(&bridge->mutex); uv_cond_destroy(&bridge->cond); xfree(bridge->ui); // Threads joined, now safe to free UI container. #7922 - ui_detach_impl(b); xfree(b); } static void ui_bridge_stop_event(void **argv) |