From 9cce3882d11df422fc926bde8b835c0dcfe53b2c Mon Sep 17 00:00:00 2001 From: 3djc Date: Mon, 12 Aug 2019 10:50:17 +0200 Subject: [PATCH] Fix #6608 --- companion/src/modelslist.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/companion/src/modelslist.cpp b/companion/src/modelslist.cpp index 443432a3c2..8e5f823694 100644 --- a/companion/src/modelslist.cpp +++ b/companion/src/modelslist.cpp @@ -726,7 +726,7 @@ void TreeModel::refresh() protocol = model.moduleData[j].protocol; // These are the only RXs that allow nominating RX # but changing RX or copying models can leave residual configuration which can cause issues // if (protocol == PULSES_PXX_XJT_X16 || protocol == PULSES_PXX_XJT_LR12 || protocol == PULSES_PXX_R9M || protocol == PULSES_DSMX || protocol == PULSES_MULTIMODULE) { - if (!protocol == PULSES_OFF && model.moduleData[j].modelId > 0) { + if (protocol != PULSES_OFF && model.moduleData[j].modelId > 0) { if (!rxs.isEmpty()) { rxs.append(", "); } @@ -735,10 +735,6 @@ void TreeModel::refresh() if (!isModelIdUnique(mdlidx)) { current->setHighlightRX(true); } - ModelData & mdl = radioData->models[mdlidx-1]; - if (mdl.isEmpty()) { - current->setHighlightRX(true); - } } } current->setData(currentColumn++, rxs);