From f95467d71b74169718b2cf5df160974c32749f30 Mon Sep 17 00:00:00 2001 From: Rascafr Date: Fri, 11 Sep 2020 22:17:40 +0200 Subject: [PATCH] loaded_file_name goes back to default 'scanner' file if load step fails --- firmware/application/apps/ui_scanner.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/firmware/application/apps/ui_scanner.cpp b/firmware/application/apps/ui_scanner.cpp index 1b8d26989..754853a2b 100644 --- a/firmware/application/apps/ui_scanner.cpp +++ b/firmware/application/apps/ui_scanner.cpp @@ -387,8 +387,6 @@ ScannerView::ScannerView( void ScannerView::frequency_file_load(std::string file_name, bool stop_all_before) { - loaded_file_name = file_name; // keep loaded filename in memory - // stop everything running now if required if (stop_all_before) { scan_thread->stop(); @@ -398,6 +396,7 @@ void ScannerView::frequency_file_load(std::string file_name, bool stop_all_befor } if ( load_freqman_file(file_name, database) ) { + loaded_file_name = file_name; // keep loaded filename in memory for(auto& entry : database) { // READ LINE PER LINE if (frequency_list.size() < MAX_DB_ENTRY) { //We got space! if (entry.type == RANGE) { //RANGE @@ -435,6 +434,7 @@ void ScannerView::frequency_file_load(std::string file_name, bool stop_all_befor } else { + loaded_file_name = 'SCANNER'; // back to the default frequency file desc_cycle.set(" NO " + file_name + ".TXT FILE ..." ); } audio::output::stop();