Merge pull request #730 from cjcliffe/appimage_configload

Move config load out of commandline parse to prevent wrong path in AppImage
This commit is contained in:
Charles J. Cliffe 2019-05-13 22:59:04 -04:00 committed by GitHub
commit 0fa818c2fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -200,6 +200,8 @@ public:
CubicSDR::CubicSDR() : frequency(0), offset(0), ppm(0), snap(1), sampleRate(DEFAULT_SAMPLE_RATE), agcMode(false)
{
config.load();
sampleRateInitialized.store(false);
agcMode.store(true);
soloMode.store(false);
@ -551,8 +553,6 @@ bool CubicSDR::OnCmdLineParsed(wxCmdLineParser& parser) {
}
}
config.load();
#ifdef BUNDLE_SOAPY_MODS
if (parser.Found("b")) {
useLocalMod.store(false);