Fix crash on config reload when there is no config

Wiebe Cazemier
1 parent 1b3c90ae
Showing 3 changed files with 11 additions and 2 deletions
configfileparser.cpp
configfileparser.h
mainapp.cpp
@@ -445,5 +445,12 @@ void ConfigFileParser::loadFile(bool test)
     }
 }
  
+std::unique_ptr<Settings> ConfigFileParser::moveSettings()
+{
+    std::unique_ptr<Settings> tmp = std::move(settings);
+    settings.reset(new Settings);
+    return tmp;
+}
+
  
  
@@ -44,6 +44,8 @@ class ConfigFileParser
     std::set<std::string> validKeys;
     std::set<std::string> validListenKeys;
  
+    std::unique_ptr<Settings> settings;
+
     void testKeyValidity(const std::string &key, const std::set<std::string> &validKeys) const;
     void checkFileExistsAndReadable(const std::string &key, const std::string &pathToCheck, ssize_t max_size = std::numeric_limits<ssize_t>::max()) const;
     void checkFileOrItsDirWritable(const std::string &filepath) const;
@@ -51,7 +53,7 @@ public:
     ConfigFileParser(const std::string &path);
     void loadFile(bool test);
  
-    std::unique_ptr<Settings> settings;
+    std::unique_ptr<Settings> moveSettings();
 };
  
 #endif // CONFIGFILEPARSER_H
@@ -628,7 +628,7 @@ void MainApp::loadConfig()
     // Atomic loading, first test.
     confFileParser->loadFile(true);
     confFileParser->loadFile(false);
-    settings = std::move(confFileParser->settings);
+    settings = confFileParser->moveSettings();
  
     if (settings->listeners.empty())
     {