sway

commit 1a8b9fda8a81d71ec9de65fd4c3f1df40e03f971
parent c55bc40cc15de5a9390329c56d922d006aa7ebee
Author: Brian Ashworth <bosrsf04@gmail.com>
Date:   Mon, 26 Aug 2019 22:58:01 -0400

cmd_mode: don't reset to default after subcommand

In cmd_mode, the mode is currently being reset to the default mode after
a mode subcommand handler is executed. This stores and restores the mode
instead

Diffstat:
M
sway/commands/mode.c
 | 
3
++-

1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sway/commands/mode.c b/sway/commands/mode.c
@@ -67,6 +67,7 @@ struct cmd_results *cmd_mode(int argc, char **argv) {
 		return error;
 	}
 	// Set current mode
+	struct sway_mode *stored_mode = config->current_mode;
 	config->current_mode = mode;
 	if (argc == 1) {
 		// trigger IPC mode event
@@ -80,7 +81,7 @@ struct cmd_results *cmd_mode(int argc, char **argv) {
 	// Create binding
 	struct cmd_results *result = config_subcommand(argv + 1, argc - 1,
 			mode_handlers, sizeof(mode_handlers));
-	config->current_mode = config->modes->items[0];
+	config->current_mode = stored_mode;
 
 	return result;
 }