Fix parsing of Ultimate version.txt

The bloody format of version.txt never stays the same, hopefully the current regex works for future updates as well.
oblivioncth · Jun 30, 2024 · bfe43c4 · bfe43c4
1 parent 45f2145
commit bfe43c4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -79,7 +79,7 @@ ob_fetch_qx(
 
 # Fetch libfp (build and import from source)
 include(OB/Fetchlibfp)
-ob_fetch_libfp("7fb8242593457033ca25008ec5d79d3f5a4ca0b7")
+ob_fetch_libfp("5ff81d39c13e40f7fbfe01e44dc2170648d35dc8")
 
 # Fetch QI-QMP (build and import from source)
 include(OB/FetchQI-QMP)

diff --git a/app/src/kernel/core.cpp b/app/src/kernel/core.cpp
@@ -436,9 +436,10 @@ void Core::attachFlashpoint(std::unique_ptr<Fp::Install> flashpointInstall)
     mFlashpointInstall = std::move(flashpointInstall);
 
     // Note install details
-    logEvent(LOG_EVENT_FLASHPOINT_VERSION_TXT.arg(mFlashpointInstall->nameVersionString()));
-    logEvent(LOG_EVENT_FLASHPOINT_VERSION.arg(mFlashpointInstall->version().toString()));
-    logEvent(LOG_EVENT_FLASHPOINT_EDITION.arg(ENUM_NAME(mFlashpointInstall->edition())));
+    auto info = mFlashpointInstall->versionInfo();
+    logEvent(LOG_EVENT_FLASHPOINT_VERSION_TXT.arg(info->fullString()));
+    logEvent(LOG_EVENT_FLASHPOINT_VERSION.arg(info->version().toString()));
+    logEvent(LOG_EVENT_FLASHPOINT_EDITION.arg(ENUM_NAME(info->edition())));
     logEvent(LOG_EVENT_OUTFITTED_DAEMON.arg(ENUM_NAME(mFlashpointInstall->outfittedDaemon())));
 
     // Initialize child process env vars