From 8b57764364fab4610e2e25f9c2005c8553f81053 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= <mat@brain-dump.org>
Date: Tue, 27 Oct 2015 11:06:20 +0100
Subject: ui: properly restore terminal state upon exit

---
 ui-curses.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ui-curses.c b/ui-curses.c
index 3bc7c2b..eb6acff 100644
--- a/ui-curses.c
+++ b/ui-curses.c
@@ -853,7 +853,10 @@ static UiWin *ui_window_new(Ui *ui, View *view, File *file) {
 }
 
 static void ui_die(Ui *ui, const char *msg, va_list ap) {
+	UiCurses *uic = (UiCurses*)ui;
 	endwin();
+	if (uic->termkey)
+		termkey_stop(uic->termkey);
 	vfprintf(stderr, msg, ap);
 	exit(EXIT_FAILURE);
 }
@@ -972,17 +975,17 @@ static const char *ui_getkey(Ui *ui) {
 
 static void ui_terminal_save(Ui *ui) {
 	UiCurses *uic = (UiCurses*)ui;
-	termkey_stop(uic->termkey);
 	curs_set(1);
 	reset_shell_mode();
+	termkey_stop(uic->termkey);
 }
 
 static void ui_terminal_restore(Ui *ui) {
 	UiCurses *uic = (UiCurses*)ui;
+	termkey_start(uic->termkey);
 	reset_prog_mode();
 	wclear(stdscr);
 	curs_set(0);
-	termkey_start(uic->termkey);
 }
 
 Ui *ui_curses_new(void) {
-- 
cgit v1.2.3