sway

commit ee5c4f38c9db849b6c4034e792b451eb8d6d2627
parent 646019cad9e8a075911e960fc7645471d9c26bf6
Author: Kenny Levinsen <kl@kl.wtf>
Date:   Wed,  1 May 2024 14:19:54 +0200

config/output: Use all outputs for config merge

When storing a config, we need to find the output that is being
configured to extract its identifier. output_by_name_or_id does not
return outputs that are disabled, and using this makes it impossible to
merge configurations related to disabled outputs.

Switch to all_outputs_by_name_or_id.

Fixes: https://github.com/swaywm/sway/issues/8141

Diffstat:
M
sway/config/output.c
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sway/config/output.c b/sway/config/output.c
@@ -210,7 +210,7 @@ static void merge_output_config(struct output_config *dst, struct output_config 
 void store_output_config(struct output_config *oc) {
 	bool merged = false;
 	bool wildcard = strcmp(oc->name, "*") == 0;
-	struct sway_output *output = wildcard ? NULL : output_by_name_or_id(oc->name);
+	struct sway_output *output = wildcard ? NULL : all_output_by_name_or_id(oc->name);
 
 	char id[128];
 	if (output) {