Skip to content

Commit 62aa3a9

Browse files
authored
Fixed combination button lighting when a crescendo was in the Override=Off mode #1935 (#2009)
1 parent 35d880a commit 62aa3a9

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
- Fixed combination button lighting when a crescendo was in the Override=Off mode https://github.com/GrandOrgue/grandorgue/issues/1935
12
# 3.15.1 (2024-09-03)
23
- Fixed saving of Settings->Paths https://github.com/GrandOrgue/grandorgue/issues/1907
34
- Fixed crash on releasing a key of any Binauralpipes organ https://github.com/GrandOrgue/grandorgue/issues/1986

src/grandorgue/combinations/GOSetter.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1025,8 +1025,8 @@ void GOSetter::PushGeneral(
10251025
= GetCrescendoAddSet(elementSet);
10261026

10271027
NotifyCmbPushed(cmb.Push(m_state, pExtraSet));
1028-
if (!pExtraSet) { // Otherwise the crescendo in add mode:
1029-
// not to switch off combination buttons
1028+
if (pButtonToLight || !pExtraSet) { // Otherwise the crescendo in add mode:
1029+
// not to switch off combination buttons
10301030
UpdateAllSetsButtonsLight(pButtonToLight, -1);
10311031
}
10321032
}
@@ -1042,7 +1042,7 @@ void GOSetter::PushDivisional(
10421042
= GetCrescendoAddSet(elementSet);
10431043

10441044
NotifyCmbPushed(cmb.Push(m_state, pExtraSet));
1045-
if (!pExtraSet)
1045+
if (pButtonToLight || !pExtraSet)
10461046
UpdateAllSetsButtonsLight(pButtonToLight, cmbManual);
10471047
}
10481048
}

0 commit comments

Comments
 (0)