aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/os_unix.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2017-06-07 23:19:02 +0200
committerGitHub <noreply@github.com>2017-06-07 23:19:02 +0200
commit16cce1ac17456e3758f95af6ce7289bade3bb285 (patch)
tree1e5bc9c076e6a49dcc750cb686c45a0e371b3a31 /src/nvim/os_unix.c
parentd3d0c9a7b11cad3f277f732dee6c782d1d911b48 (diff)
parentbc025ab117c92418f890085dc13f26cb7c976772 (diff)
downloadrneovim-16cce1ac17456e3758f95af6ce7289bade3bb285.tar.gz
rneovim-16cce1ac17456e3758f95af6ce7289bade3bb285.tar.bz2
rneovim-16cce1ac17456e3758f95af6ce7289bade3bb285.zip
Merge #6827 'Always enable logging'
Diffstat (limited to 'src/nvim/os_unix.c')
-rw-r--r--src/nvim/os_unix.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c
index fb648fbcf8..692bcc97f4 100644
--- a/src/nvim/os_unix.c
+++ b/src/nvim/os_unix.c
@@ -141,7 +141,9 @@ void mch_exit(int r) FUNC_ATTR_NORETURN
ui_flush();
ml_close_all(true); // remove all memfiles
- event_teardown();
+ if (!event_teardown() && r == 0) {
+ r = 1; // Exit with error if main_loop did not teardown gracefully.
+ }
stream_set_blocking(input_global_fd(), true); // normalize stream (#2598)
#ifdef EXITFREE