1 files changed, 7 insertions, 1 deletions

diff --git a/sway/commands/bar/hidden_state.c b/sway/commands/bar/hidden_state.c
index b2c2d245..1f08a5d2 100644
--- a/sway/commands/bar/hidden_state.c
+++ b/sway/commands/bar/hidden_state.c
@@ -23,7 +23,7 @@ static struct cmd_results *bar_set_hidden_state(struct bar_config *bar,
                 return cmd_results_new(CMD_INVALID, "Invalid value %s", hidden_state);
         }
         if (strcmp(old_state, bar->hidden_state) != 0) {
-                if (!config->reading) {
+                if (!config->current_bar) {
                         ipc_event_barconfig_update(bar);
                 }
                 sway_log(SWAY_DEBUG, "Setting hidden_state: '%s' for bar: %s",
@@ -47,6 +47,12 @@ struct cmd_results *bar_cmd_hidden_state(int argc, char **argv) {
                                 "Unexpected value %s in config mode", argv[1]);
         }
 
+        if (config->current_bar && argc == 2 &&
+                        strcmp(config->current_bar->id, argv[1]) != 0) {
+                return cmd_results_new(CMD_INVALID, "Conflicting bar ids: %s and %s",
+                                config->current_bar->id, argv[1]);
+        }
+
         const char *state = argv[0];
         if (config->reading) {
                 error = bar_set_hidden_state(config->current_bar, state);