Fixed crash on loading an organ with a crescendo in Add mode GrandOrg…

…ue#1772
oleg68 · Jan 14, 2024 · 6886512 · 6886512
1 parent ca45a49
commit 6886512
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,4 @@
+- Fixed crash on loading an organ with a crescendo in Add mode https://github.com/GrandOrgue/grandorgue/issues/1772
 # 3.13.3 (2024-01-07)
 - Fixed not loading a pipe if some loop was not suitable for crossfade https://github.com/GrandOrgue/grandorgue/issues/1724
 - Fixed a wrong .wav filename in the log message window https://github.com/GrandOrgue/grandorgue/issues/1724

diff --git a/src/grandorgue/combinations/model/GOCombination.cpp b/src/grandorgue/combinations/model/GOCombination.cpp
@@ -213,6 +213,8 @@ void GOCombination::SetStatesFromYaml(
 void GOCombination::GetExtraSetState(
   GOCombination::ExtraElementsSet &extraSet) {
   extraSet.clear();
+  // May be called from init a crescendo before init combinations
+  UpdateState();
   for (unsigned i = 0; i < r_ElementDefinitions.size(); i++) {
     if (
       m_State[i] == 0 && r_ElementDefinitions[i].control->GetCombinationState())