TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-01-13 01:43:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

loaded_file_name goes back to default 'scanner' file if load step fails

Browse Source
This commit is contained in:
Rascafr 2020-09-11 22:17:40 +02:00
parent 200c57f990
commit f95467d71b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/application/apps/ui_scanner.cpp
View File

@ -387,8 +387,6 @@ ScannerView::ScannerView(
void ScannerView::frequency_file_load(std::string file_name, bool stop_all_before) { 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 // stop everything running now if required
if (stop_all_before) { if (stop_all_before) {
scan_thread->stop(); 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) ) { 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 for(auto& entry : database) { // READ LINE PER LINE
if (frequency_list.size() < MAX_DB_ENTRY) { //We got space! if (frequency_list.size() < MAX_DB_ENTRY) { //We got space!
if (entry.type == RANGE) { //RANGE if (entry.type == RANGE) { //RANGE
@ -435,6 +434,7 @@ void ScannerView::frequency_file_load(std::string file_name, bool stop_all_befor
} }
else else
{ {
loaded_file_name = 'SCANNER'; // back to the default frequency file
desc_cycle.set(" NO " + file_name + ".TXT FILE ..." ); desc_cycle.set(" NO " + file_name + ".TXT FILE ..." );
} }
audio::output::stop(); audio::output::stop();