comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-11-12 23:26:10 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #730 from cjcliffe/appimage_configload

Browse Source 
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
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CubicSDR.cpp
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);
@ -550,8 +552,6 @@ bool CubicSDR::OnCmdLineParsed(wxCmdLineParser& parser) {
config.setConfigName(confName->ToStdString());
}
}
config.load();
#ifdef BUNDLE_SOAPY_MODS
if (parser.Found("b")) {