Merge pull request #730 from cjcliffe/appimage_configload

Move config load out of commandline parse to prevent wrong path in AppImage
cjcliffe · May 14, 2019 · 0fa818c · 0fa818c
2 parents 0131c4d + 1f188a3
commit 0fa818c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/CubicSDR.cpp b/src/CubicSDR.cpp
@@ -200,6 +200,8 @@ class ActionDialogBookmarkLoadFailed : public ActionDialog {
 
 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")) {