From 6886512d316e79ade39e55c593740420440458f8 Mon Sep 17 00:00:00 2001 From: Oleg Samarin Date: Sun, 14 Jan 2024 22:15:03 +0300 Subject: [PATCH] Fixed crash on loading an organ with a crescendo in Add mode https://github.com/GrandOrgue/grandorgue/issues/1772 --- CHANGELOG.md | 1 + src/grandorgue/combinations/model/GOCombination.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9181c05a1..15efe83e4 100644 --- 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 index 925700b95..66c0607e3 100644 --- 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())