LoggedFstream: Fix OpenFile error check

Fixes #6626
diasurgical · Nov 9, 2024 · e010591 · e010591
1 parent cce04b5
commit e010591
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Source/init.cpp b/Source/init.cpp
@@ -155,7 +155,9 @@ std::vector<std::string> GetMPQSearchPaths()
 	}
 #endif
 
-	paths.emplace_back(""); // PWD
+	if (paths.empty() || !paths.back().empty()) {
+		paths.emplace_back(); // PWD
+	}
 
 	if (SDL_LOG_PRIORITY_VERBOSE >= SDL_LogGetPriority(SDL_LOG_CATEGORY_APPLICATION)) {
 		LogVerbose("Paths:\n    base: {}\n    pref: {}\n  config: {}\n  assets: {}",

diff --git a/Source/utils/file_util.cpp b/Source/utils/file_util.cpp
@@ -94,9 +94,9 @@ bool FileExists(const char *path)
 			::SetLastError(ERROR_SUCCESS);
 		} else {
 #if defined(NXDK)
-			LogError("GetFileAttributesA: error code {}", ::GetLastError());
+			LogError("GetFileAttributesA({}): error code {}", path, ::GetLastError());
 #else
-			LogError("PathFileExistsW: error code {}", ::GetLastError());
+			LogError("PathFileExistsW({}): error code {}", path, ::GetLastError());
 #endif
 		}
 		return false;

diff --git a/Source/utils/logged_fstream.hpp b/Source/utils/logged_fstream.hpp
@@ -17,7 +17,7 @@ struct LoggedFStream {
 	bool Open(const char *path, const char *mode)
 	{
 		s_ = OpenFile(path, mode);
-		return CheckError("fopen(\"{}\", \"{}\")", path, mode);
+		return CheckError(s_ != nullptr, "fopen(\"{}\", \"{}\")", path, mode);
 	}
 
 	void Close()