Merge pull request #3707 from rism-digital/develop-fix-rest

Additional check for boundaries in Rest::GetRestOffsetFromOptions
rism-digital · Jun 17, 2024 · c508e2e · c508e2e
2 parents ab7a0b9 + 3e321c8
commit c508e2e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/rest.cpp b/src/rest.cpp
@@ -540,7 +540,9 @@ int Rest::GetRestOffsetFromOptions(
     RestLayer layer, const std::pair<int, RestAccidental> &location, bool isTopLayer) const
 {
     int duration = this->GetActualDur();
-    if (duration > DURATION_128) duration = DURATION_128;
+    // Make sure we are in the boundaries of g_defaultRests
+    if (duration > DUR_128) duration = DUR_128;
+    if (duration < DUR_LG) duration = DUR_LG;
     return g_defaultRests.at(layer)
         .at(RL_sameLayer == layer ? location.second : RA_none)
         .at(isTopLayer ? RLP_restOnTopLayer : RLP_restOnBottomLayer)