From c2588efbca9762bf7a122222a4835bb9453538dc Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Fri, 17 Sep 2021 11:15:33 +0200 Subject: [PATCH] Prevent proto list to be fetched when started in anything but "normal" mode --- radio/src/gui/colorlcd/radio_spectrum_analyser.cpp | 2 ++ radio/src/io/multi_protolist.cpp | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/radio/src/gui/colorlcd/radio_spectrum_analyser.cpp b/radio/src/gui/colorlcd/radio_spectrum_analyser.cpp index 544e68672..d7d891003 100644 --- a/radio/src/gui/colorlcd/radio_spectrum_analyser.cpp +++ b/radio/src/gui/colorlcd/radio_spectrum_analyser.cpp @@ -226,6 +226,8 @@ void RadioSpectrumAnalyser::init() if (moduleIdx == INTERNAL_MODULE && g_model.moduleData[INTERNAL_MODULE].type == MODULE_TYPE_NONE) { reusableBuffer.spectrumAnalyser.moduleOFF = true; + // this needs to be set BEFORE the module is set to prevent proto list scanning + moduleState[moduleIdx].mode = MODULE_MODE_SPECTRUM_ANALYSER; setModuleType(INTERNAL_MODULE, MODULE_TYPE_MULTIMODULE); } else { reusableBuffer.spectrumAnalyser.moduleOFF = false; diff --git a/radio/src/io/multi_protolist.cpp b/radio/src/io/multi_protolist.cpp index 830f86eb3..029e5cd82 100644 --- a/radio/src/io/multi_protolist.cpp +++ b/radio/src/io/multi_protolist.cpp @@ -205,7 +205,9 @@ void MultiRfProtocols::fillList(std::function addProto) co bool MultiRfProtocols::triggerScan() { - if (scanState == ScanStop) { + if (scanState == ScanStop + && moduleState[moduleIdx].mode == MODULE_MODE_NORMAL) { + proto2idx.clear(); protoList.clear(); scanState = ScanBegin;