allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

fix repeated thinkos during deserialization of SegmentDescriptors

Browse Source
This commit is contained in:
Paul Davis
2025-10-20 12:50:03 -06:00
parent 3dd3b857cd
commit b460ce6d6a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/ardour/segment_descriptor.cc
View File

@@ -45,7 +45,7 @@ SegmentDescriptor::SegmentDescriptor (XMLNode const & node, int version)
, _tempo (120, 4)
, _meter (4, 4)
{
if (!set_state (node, version)) {
if (set_state (node, version)) {
throw failed_constructor ();
}
}
@@ -156,22 +156,22 @@ SegmentDescriptor::set_state (XMLNode const & node, int version)
return -1;
}
if (node.get_property (X_("time-domain"), _time_domain)) {
if (!node.get_property (X_("time-domain"), _time_domain)) {
return -1;
}
if (_time_domain == Temporal::AudioTime) {
if (node.get_property (X_("position"), _position_samples)) {
if (!node.get_property (X_("position"), _position_samples)) {
return -1;
}
if (node.get_property (X_("duration"), _duration_samples)) {
if (!node.get_property (X_("duration"), _duration_samples)) {
return -1;
}
} else {
if (node.get_property (X_("position"), _position_beats)) {
if (!node.get_property (X_("position"), _position_beats)) {
return -1;
}
if (node.get_property (X_("duration"), _duration_beats)) {
if (!node.get_property (X_("duration"), _duration_beats)) {
return -1;
}
}