caiyu/LibreVNA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent crash on setup parsing file error + activate first mode if none specified

Browse Source
This commit is contained in:
Jan Käberich 2022-07-09 16:32:29 +02:00
parent c21f51bf46
commit b4abca85c1
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Software/PC_Application/appwindow.cpp
View File

@ -1117,6 +1117,8 @@ void AppWindow::LoadSetup(QString filename)
} catch (exception &e) { } catch (exception &e) {
InformationBox::ShowError("Error", "Failed to parse the setup file (" + QString(e.what()) + ")"); InformationBox::ShowError("Error", "Failed to parse the setup file (" + QString(e.what()) + ")");
qWarning() << "Parsing of setup file failed: " << e.what(); qWarning() << "Parsing of setup file failed: " << e.what();
file.close();
return;
} }
file.close(); file.close();
LoadSetup(j); LoadSetup(j);
@ -1170,6 +1172,10 @@ void AppWindow::LoadSetup(nlohmann::json j)
break; break;
} }
} }
// if no mode is activated, there might have been a problem with the setup file. Activate the first mode anyway, to prevent invalid GUI state
if(!Mode::getActiveMode() && Mode::getModes().size() > 0) {
Mode::getModes()[0]->activate();
}
} }
Device *&AppWindow::getDevice() Device *&AppWindow::getDevice()