3 files changed, 38 insertions, 15 deletions

diff --git a/build.c b/build.c
index ba85cdd..cca1700 100644
--- a/build.c
+++ b/build.c
@@ -12,6 +12,10 @@ static void build_stop(Ted *ted) {
 		free(*cmd);
 	}
 	arr_clear(ted->build_queue);
+	if (ted->active_buffer == &ted->build_buffer) {
+		ted->active_buffer = NULL;
+		ted_reset_active_buffer(ted);
+	}
 }
 
 // call before adding anything to the build queue
diff --git a/command.c b/command.c
index 34aaf0b..8c1bf94 100644
--- a/command.c
+++ b/command.c
@@ -301,23 +301,29 @@ void command_execute(Ted *ted, Command c, i64 argument) {
 	case CMD_TAB_CLOSE: {
 		if (ted->menu) {
 			menu_close(ted);
-		} else {
-			if (node) {
-				u16 tab_idx = node->active_tab;
-				buffer = &ted->buffers[node->tabs[tab_idx]];
-				// (an argument of 2 overrides the unsaved changes dialog)
-				if (argument != 2 && buffer_unsaved_changes(buffer)) {
-					// there are unsaved changes!
-					ted->warn_unsaved = CMD_TAB_CLOSE;
-					strbuf_printf(ted->warn_unsaved_names, "%s", path_filename(buffer->filename));
-					menu_open(ted, MENU_WARN_UNSAVED);
-				} else {
-					node_tab_close(ted, node, node->active_tab);
-				}
+		} else if (ted->find) {
+			find_close(ted);
+		} else if (node) {
+			u16 tab_idx = node->active_tab;
+			buffer = &ted->buffers[node->tabs[tab_idx]];
+			// (an argument of 2 overrides the unsaved changes dialog)
+			if (argument != 2 && buffer_unsaved_changes(buffer)) {
+				// there are unsaved changes!
+				ted->warn_unsaved = CMD_TAB_CLOSE;
+				strbuf_printf(ted->warn_unsaved_names, "%s", path_filename(buffer->filename));
+				menu_open(ted, MENU_WARN_UNSAVED);
 			} else {
-				command_execute(ted, CMD_QUIT, 1);
-				return;
+				node_tab_close(ted, node, node->active_tab);
 			}
+		} else if (ted->build_shown) {
+			build_stop(ted);
+		} else if (ted->nodes_used[0]) {
+			// there are nodes open, but no active node.
+			// do nothing.
+		} else {
+			// no nodes open
+			command_execute(ted, CMD_QUIT, 1);
+			return;
 		}
 	} break;
 	case CMD_TAB_NEXT:
diff --git a/ted.c b/ted.c
index cb227fa..c5d264b 100644
--- a/ted.c
+++ b/ted.c
@@ -139,6 +139,19 @@ void ted_switch_to_buffer(Ted *ted, TextBuffer *buffer) {
 	}
 }
 
+// set ted->active_buffer to something nice
+static void ted_reset_active_buffer(Ted *ted) {
+	if (ted->nodes_used[0]) {
+		Node *node = &ted->nodes[0];
+		while (!node->tabs)
+			node = &ted->nodes[node->split_a]; // arbitrarily pick split_a.
+		ted_switch_to_buffer(ted, &ted->buffers[node->tabs[node->active_tab]]);
+	} else {
+		// there's nothing to set it to
+		ted->active_buffer = NULL;
+	}
+}
+
 
 // returns the index of an available buffer, or -1 if none are available 
 static i32 ted_new_buffer(Ted *ted) {