aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFurkan Sahin <furkan-dev@proton.me>2024-05-01 14:19:54 +0200
committerFurkan Sahin <furkan-dev@proton.me>2024-05-01 14:19:54 +0200
commitc5fbb3e99a39f8e612c8335e73f9df10a813e6bb (patch)
tree946b8f869e8df8ab3fea3e51e55f61ac4874656f
parent7c8ae1726d062a92e5c855d23f9d5eb843f49478 (diff)
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
-rw-r--r--sway/config/output.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/config/output.c b/sway/config/output.c
index 54af5d8e..7e037676 100644
--- 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) {