From 0658dd9a3efccaae709f5fb18a09e00991886c1c Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Sun, 30 Jul 2023 16:20:28 -0400 Subject: [PATCH] Make Dalamud version read more durable and future-proof --- launcher/src/profile.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/launcher/src/profile.cpp b/launcher/src/profile.cpp index a855b2b..789819c 100644 --- a/launcher/src/profile.cpp +++ b/launcher/src/profile.cpp @@ -26,10 +26,10 @@ Profile::Profile(LauncherCore &launcher, const QString &key, QObject *parent) QJsonDocument doc = QJsonDocument::fromJson(depsJson.readAll()); QString versionString; - if (doc["targets"].toObject().contains(".NETCoreApp,Version=v5.0")) { - versionString = doc["targets"].toObject()[".NETCoreApp,Version=v5.0"].toObject().keys().filter("Dalamud")[0]; - } else { - versionString = doc["targets"].toObject()[".NETCoreApp,Version=v6.0"].toObject().keys().filter("Dalamud")[0]; + for (auto target : doc["targets"].toObject().keys()) { + if (target.contains(".NETCoreApp")) { + versionString = doc["targets"].toObject()[target].toObject().keys().filter("Dalamud/")[0]; + } } dalamudVersion = versionString.remove("Dalamud/");