summaryrefslogtreecommitdiff
path: root/sway/commands.c
diff options
context:
space:
mode:
Diffstat (limited to 'sway/commands.c')
-rw-r--r--sway/commands.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/sway/commands.c b/sway/commands.c
index f891792f..452f3c34 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -804,12 +804,14 @@ static struct cmd_results *cmd_output(int argc, char **argv) {
i = list_seq_find(config->output_configs, output_name_cmp, name);
if (i >= 0) {
- // replace existing config
+ // merge existing config
struct output_config *oc = config->output_configs->items[i];
- list_del(config->output_configs, i);
- free_output_config(oc);
+ merge_output_config(oc, output);
+ free_output_config(output);
+ output = oc;
+ } else {
+ list_add(config->output_configs, output);
}
- list_add(config->output_configs, output);
sway_log(L_DEBUG, "Config stored for output %s (enabled:%d) (%d x %d @ %d, %d) (bg %s %s)",
output->name, output->enabled, output->width,