mirror of
https://cagebreak.project-repo.co/cagebreak.git
synced 2026-08-19 12:04:18 +02:00
Fix bug in merge_output_configs (#44)
We were accidentally copying angles into status! Signed-off-by: Tom Greig <tom@tomg.xyz>
This commit is contained in:
parent
000e6f1410
commit
8850488f0e
2 changed files with 10 additions and 1 deletions
9
Bugs.md
9
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.
|
||||
|
|
|
|||
2
output.c
2
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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue