Merge branch 'develop' into develop

Signed-off-by: Gideon9212 <gideon_gallagher@zoho.com>

1 files changed, 9 insertions, 7 deletions

diff --git a/launcher/settings/INISettingsObject.cpp b/launcher/settings/INISettingsObject.cpp
index 3677e238..da962ee9 100644
--- a/launcher/settings/INISettingsObject.cpp
+++ b/launcher/settings/INISettingsObject.cpp
@@ -23,14 +23,16 @@ INISettingsObject::INISettingsObject(QStringList paths, QObject *parent)
     : SettingsObject(parent)
 {
     auto first_path = paths.constFirst();
-    auto path = paths.takeFirst();
-    while (!QFile::exists(path))
-        path = paths.takeFirst();
+    for (auto path : paths) {
+        if (!QFile::exists(path))
+            continue;
 
-    if (path != first_path && QFile::exists(path)) {
-        // Copy the fallback to the preferred path.
-        QFile::copy(path, first_path);
-        qDebug() << "Copied settings from" << path << "to" << first_path;
+        if (path != first_path && QFile::exists(path)) {
+            // Copy the fallback to the preferred path.
+            QFile::copy(path, first_path);
+            qDebug() << "Copied settings from" << path << "to" << first_path;
+            break;
+        }
     }
 
     m_filePath = first_path;