From 8850488f0e886c7ff0efb544da62cd5a418cb2ab Mon Sep 17 00:00:00 2001 From: Uks2 Date: Mon, 24 Apr 2023 20:04:40 +0100 Subject: [PATCH] Fix bug in merge_output_configs (#44) We were accidentally copying angles into status! Signed-off-by: Tom Greig --- Bugs.md | 9 +++++++++ output.c | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Bugs.md b/Bugs.md index d8a33a1..5b5bd4a 100644 --- a/Bugs.md +++ b/Bugs.md @@ -1170,3 +1170,12 @@ leading to a termination of cagebreak. * Fixed: 2.1.0 Prior to release 2.1.0 `meson install` did not work perfectly. + +## Issue 60 + + * github issue number: N/A + * Fixed: 2.1.2 + +In the `merge_output_configs` function, when copying the properties of +one config to another, the `angles` element of an input structure was +being copied to the `status` element of the resultant structure. diff --git a/output.c b/output.c index b8fc627..506f5bd 100644 --- a/output.c +++ b/output.c @@ -399,7 +399,7 @@ merge_output_configs(struct cg_output_config *cfg1, out_cfg->scale = cfg1->scale; } if(cfg1->angle == out_cfg->angle) { - out_cfg->status = cfg2->angle; + out_cfg->angle = cfg2->angle; } else { out_cfg->angle = cfg1->angle; }