ensureSettingsFileExists func for readability

ebu · Dec 14, 2023 · 6a97ce7 · 6a97ce7
1 parent ba3bc28
commit 6a97ce7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/shared/update_check_settings_file.cpp b/shared/update_check_settings_file.cpp
@@ -7,7 +7,7 @@ UpdateCheckerSettingsFile::UpdateCheckerSettingsFile()
     settingsFile = ResourcePaths::getSettingsDirectory(true).getChildFile("UpdateCheck.settings");
     if (!settingsFileExists()) {
         // No settings file - perhaps first run?
-        if (saveSettings() && settingsFileExists()) {
+        if (ensureSettingsFileExists()) {
             // Settings file is writable so probably was just first run.
             // Set autocheck on initially.
             setAutoCheckEnabled(true);
@@ -97,3 +97,12 @@ bool UpdateCheckerSettingsFile::settingsFileExists()
 {
     return settingsFile.existsAsFile();
 }
+
+bool UpdateCheckerSettingsFile::ensureSettingsFileExists()
+{
+    bool success = settingsFileExists();
+    if (!success) {
+        success = saveSettings() && settingsFileExists();
+    }
+    return success;
+}
diff --git a/shared/update_check_settings_file.h b/shared/update_check_settings_file.h
@@ -22,6 +22,7 @@ class UpdateCheckerSettingsFile {
     bool loadSettings();
     bool saveSettings();
     bool settingsFileExists();
+    bool ensureSettingsFileExists();
 
     bool settingAutoCheckEnabled{ false };
     Version settingLastReportedVersion;