From 364c33060bf9577dd5c08163120963cfd06f2c63 Mon Sep 17 00:00:00 2001
From: Megamouse <studienricky89@googlemail.com>
Date: Mon, 20 Feb 2023 21:28:19 +0100
Subject: [PATCH] Fix boot by RPCS3_GAMEID constants

---
 rpcs3/Emu/System.cpp | 10 +++++-----
 rpcs3/Emu/System.h   |  3 +++
 rpcs3/main.cpp       |  8 ++++----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp
index fca2b3cb5c..19aca5fcce 100644
--- a/rpcs3/Emu/System.cpp
+++ b/rpcs3/Emu/System.cpp
@@ -1014,9 +1014,9 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
 			m_path_old = m_path;
 			resolve_path_as_vfs_path = true;
 		}
-		else if (m_path.starts_with("%RPCS3_VFS%:"))
+		else if (m_path.starts_with(vfs_boot_prefix))
 		{
-			m_path = m_path.substr(("%RPCS3_VFS%:"sv).size());
+			m_path = m_path.substr(vfs_boot_prefix.size());
 
 			if (!m_path.empty() && m_path[0] != '/')
 			{
@@ -1035,10 +1035,10 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
 
 			resolve_path_as_vfs_path =  true;
 		}
-		else if (m_path.starts_with("%RPCS3_GAMEID%:"))
+		else if (m_path.starts_with(game_id_boot_prefix))
 		{
 			// Try to boot a game through game ID only
-			m_title_id = m_path.substr(("%RPCS3_GAMEID%:"sv).size());
+			m_title_id = m_path.substr(game_id_boot_prefix.size());
 			m_title_id = m_title_id.substr(0, m_title_id.find_first_of(fs::delim));
 
 			if (m_title_id.size() < 3 && m_title_id.find_first_not_of('.') == umax)
@@ -1048,7 +1048,7 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
 				return game_boot_result::invalid_file_or_folder;
 			}
 
-			std::string tail = m_path.substr(("%RPCS3_GAMEID%:"sv).size() + m_title_id.size());
+			std::string tail = m_path.substr(game_id_boot_prefix.size() + m_title_id.size());
 
 			if (tail.find_first_not_of(fs::delim) == umax)
 			{
diff --git a/rpcs3/Emu/System.h b/rpcs3/Emu/System.h
index 17c6af19e2..6ce1e772ce 100644
--- a/rpcs3/Emu/System.h
+++ b/rpcs3/Emu/System.h
@@ -159,6 +159,9 @@ class Emulator final
 	}
 
 public:
+	static constexpr std::string_view game_id_boot_prefix = "%RPCS3_GAMEID%:";
+	static constexpr std::string_view vfs_boot_prefix = "%RPCS3_VFS%:";
+
 	Emulator() = default;
 
 	void SetCallbacks(EmuCallbacks&& cb)
diff --git a/rpcs3/main.cpp b/rpcs3/main.cpp
index 844fa4e9db..9b917716f1 100644
--- a/rpcs3/main.cpp
+++ b/rpcs3/main.cpp
@@ -1193,13 +1193,13 @@ int main(int argc, char** argv)
 	{
 		std::string spath = sstr(::at32(args, 0));
 
-		if (spath.starts_with("%RPCS3_VFS%"))
+		if (spath.starts_with(Emulator::vfs_boot_prefix))
 		{
-			sys_log.notice("Booting application from command line using VFS path: %s", spath.substr(("%RPCS3_VFS%"sv).size()));
+			sys_log.notice("Booting application from command line using VFS path: %s", spath.substr(Emulator::vfs_boot_prefix.size()));
 		}
-		else if (spath.starts_with("%RPCS3_GAMEID%"))
+		else if (spath.starts_with(Emulator::game_id_boot_prefix))
 		{
-			sys_log.notice("Booting application from command line using GAMEID: %s", spath.substr(("%RPCS3_GAMEID%"sv).size()));
+			sys_log.notice("Booting application from command line using GAMEID: %s", spath.substr(Emulator::game_id_boot_prefix.size()));
 		}
 		else
 		{