From 5c1ce884dfec4fb361ea683ec818d6b4952bc841 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= <mat@brain-dump.org>
Date: Wed, 20 Apr 2016 19:13:48 +0200
Subject: vis: handle termination from within win_open event gracefully

---
 vis.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'vis.c')

diff --git a/vis.c b/vis.c
index 593c540..47a6c79 100644
--- a/vis.c
+++ b/vis.c
@@ -280,7 +280,6 @@ bool vis_window_new(Vis *vis, const char *filename) {
 		return false;
 	}
 
-	vis_window_name(win, filename);
 	vis_draw(vis);
 
 	return true;
@@ -849,7 +848,7 @@ static void vis_args(Vis *vis, int argc, char *argv[]) {
 		}
 	}
 
-	if (!vis->windows) {
+	if (!vis->windows && vis->running) {
 		if (!strcmp(argv[argc-1], "-")) {
 			if (!vis_window_new(vis, NULL))
 				vis_die(vis, "Can not create empty buffer\n");
@@ -877,6 +876,7 @@ static void vis_args(Vis *vis, int argc, char *argv[]) {
 }
 
 int vis_run(Vis *vis, int argc, char *argv[]) {
+	vis->running = true;
 	vis_args(vis, argc, argv);
 
 	struct timespec idle = { .tv_nsec = 0 }, *timeout = NULL;
@@ -884,7 +884,6 @@ int vis_run(Vis *vis, int argc, char *argv[]) {
 	sigset_t emptyset;
 	sigemptyset(&emptyset);
 	vis_draw(vis);
-	vis->running = true;
 	vis->exit_status = EXIT_SUCCESS;
 
 	sigsetjmp(vis->sigbus_jmpbuf, 1);
-- 
cgit v1.2.3