Merge 3a95a3b into fb4cf0b

PrismLauncher · Oct 18, 2022 · 7f951a0 · 7f951a0
2 parents fb4cf0b + 3a95a3b
commit 7f951a0
Showing 1 changed file with 9 additions and 7 deletions.
diff --git 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;