Merge pull request #66 from oblivioncth/dev

Merge to master for v0.9.6
oblivioncth · Sep 9, 2023 · 656e0b4 · 656e0b4
2 parents 6b7f7ac + da52568
commit 656e0b4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.24.0...3.26.0)
 # Project
 # NOTE: DON'T USE TRAILING ZEROS IN VERSIONS
 project(CLIFp
-    VERSION 0.9.5
+    VERSION 0.9.6
     LANGUAGES CXX
     DESCRIPTION "Command-line Interface for Flashpoint Archive"
 )
@@ -72,14 +72,14 @@ endif()
 
 include(OB/FetchQx)
 ob_fetch_qx(
-    REF "v0.5.1"
+    REF "v0.5.3"
     COMPONENTS
         ${CLIFP_QX_COMPONENTS}
 )
 
 # Fetch libfp (build and import from source)
 include(OB/Fetchlibfp)
-ob_fetch_libfp("v0.4")
+ob_fetch_libfp("v0.4.2.2")
 
 # Fetch QI-QMP (build and import from source)
 include(OB/FetchQI-QMP)

diff --git a/README.md b/README.md
@@ -44,6 +44,8 @@ It is recommended to place CLIFp in the root directory of Flashpoint (next to it
 **In most cases you should use the 'static' builds of CLIFp on Windows or Linux.**
 
 ### General
+**Before using CLIFp, be sure to have ran Flashpoint through its regular launcher at least once. If using Infinity, it's also best to make sure your install is fully updated as well.**
+
 **NOTE: Do not run CLIFp as an administrator/root as some titles may not work correctly or run at all**
 
 CLIFp uses the following syntax scheme:

diff --git a/app/src/kernel/driver.cpp b/app/src/kernel/driver.cpp
@@ -231,7 +231,7 @@ void Driver::drive()
     // Ensure Flashpoint Launcher isn't running
     if(Qx::processIsRunning(Fp::Install::LAUNCHER_NAME))
     {
-        DriverError err(DriverError::AlreadyOpen, ERR_LAUNCHER_RUNNING_TIP);
+        DriverError err(DriverError::LauncherRunning, ERR_LAUNCHER_RUNNING_TIP);
         mCore->postError(NAME, err);
         mErrorStatus = err;
         finish();

diff --git a/app/src/kernel/driver.h b/app/src/kernel/driver.h
@@ -70,8 +70,8 @@ class Driver : public QObject
 
     // Logging
     static inline const QString LOG_EVENT_FLASHPOINT_SEARCH = u"Searching for Flashpoint root..."_s;
-    static inline const QString LOG_EVENT_FLASHPOINT_ROOT_CHECK = uR"(Checking if u"%1"_s is flashpoint root)"_s;
-    static inline const QString LOG_EVENT_FLASHPOINT_LINK = uR"(Linked to Flashpoint install at: u"%1"_s)"_s;
+    static inline const QString LOG_EVENT_FLASHPOINT_ROOT_CHECK = uR"(Checking if "%1" is flashpoint root)"_s;
+    static inline const QString LOG_EVENT_FLASHPOINT_LINK = uR"(Linked to Flashpoint install at: "%1")"_s;
     static inline const QString LOG_EVENT_TASK_COUNT = u"%1 task(s) to perform"_s;
     static inline const QString LOG_EVENT_QUEUE_START = u"Processing Task queue"_s;
     static inline const QString LOG_EVENT_TASK_START = u"Handling task %1 [%2] (%3)"_s;