Config: Allow the use of portable.txt (#10984)

PCSX2 · Mar 29, 2024 · 253e02b · 253e02b
1 parent b2b7fa3
commit 253e02b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -91,6 +91,7 @@ oprofile_data/
 /bin/inputprofiles
 /bin/videos
 /bin/portable.ini
+/bin/portable.txt
 
 # Manually added by user.
 /bin/resources/patches.zip

diff --git a/pcsx2/Pcsx2Config.cpp b/pcsx2/Pcsx2Config.cpp
@@ -1898,7 +1898,7 @@ void EmuFolders::SetResourcesDirectory()
 bool EmuFolders::ShouldUsePortableMode()
 {
 	// Check whether portable.ini exists in the program directory.
-	return FileSystem::FileExists(Path::Combine(AppRoot, "portable.ini").c_str());
+	return FileSystem::FileExists(Path::Combine(AppRoot, "portable.ini").c_str()) || FileSystem::FileExists(Path::Combine(AppRoot, "portable.txt").c_str());
 }
 
 void EmuFolders::SetDataDirectory()

diff --git a/updater/Updater.cpp b/updater/Updater.cpp
@@ -192,8 +192,7 @@ bool Updater::ParseZip()
 		{
 			// skip updater itself, since it was already pre-extracted.
 			// also skips portable.ini to not mess with future non-portable installs.
-			if (StringUtil::Strcasecmp(entry.destination_filename.c_str(), "updater.exe") != 0 &&
-				StringUtil::Strcasecmp(entry.destination_filename.c_str(), "portable.ini") != 0)
+			if (StringUtil::Strcasecmp(entry.destination_filename.c_str(), "updater.exe") != 0)
 			{
 				m_progress->DisplayFormattedInformation("Found file in zip: '%s'", entry.destination_filename.c_str());
 				m_update_paths.push_back(std::move(entry));