From 65028ddcdfcbfa27b0c7b2eed5d08c44753c2a12 Mon Sep 17 00:00:00 2001 From: Neil Horne <15316949+elecpower@users.noreply.github.com> Date: Sat, 29 Mar 2025 12:54:22 +1100 Subject: [PATCH] fix(cpn): remove custom switches from global functions (#6019) --- companion/src/datamodels/compounditemmodels.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/companion/src/datamodels/compounditemmodels.cpp b/companion/src/datamodels/compounditemmodels.cpp index 9eecded49..eaf177c6c 100644 --- a/companion/src/datamodels/compounditemmodels.cpp +++ b/companion/src/datamodels/compounditemmodels.cpp @@ -264,6 +264,12 @@ void RawSwitchItemModel::addItems(const RawSwitchType & type, int count) QStandardItem * modelItem = new QStandardItem(); modelItem->setData(rs.toValue(), IMDR_Id); modelItem->setData(type, IMDR_Type); + if (type == SWITCH_TYPE_SWITCH) { + if (Boards::isSwitchFunc(div(abs(rs.index) - 1, 3).quot, boardType)) + context &= ~RawSwitch::GlobalFunctionsContext; + else + context |= RawSwitch::GlobalFunctionsContext; + } modelItem->setData(context, IMDR_Flags); setDynamicItemData(modelItem, rs); appendRow(modelItem);