Catch the case where the previous character from the start is not a s…

…lash
khanghugo · Mar 10, 2024 · 83b0fb0 · 83b0fb0
1 parent 46de28a
commit 83b0fb0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/BunnymodXT/helper_functions.cpp b/BunnymodXT/helper_functions.cpp
@@ -19,7 +19,8 @@ namespace helper_functions
 		const std::string filename = current_lib_path;
 		const auto index = filename.find(start);
 
-		if (index == std::string::npos)
+		if ((index == std::string::npos) || // String not found in current path.
+			((index > 0) && (filename[index - 1] != PATH_SLASH))) // Previous character from the specified start is not a slash.
 			return current_lib_path;
 
 		com_fixslashes(new_lib_path);

diff --git a/BunnymodXT/helper_functions.hpp b/BunnymodXT/helper_functions.hpp
@@ -4,8 +4,10 @@ namespace helper_functions
 {
 	#ifdef _WIN32
 	#define DLL_EXTENSION ".dll"
+	#define PATH_SLASH '\\'
 	#else
 	#define DLL_EXTENSION ".so"
+	#define PATH_SLASH '/'
 	#endif
 
 	void com_fixslashes(std::string &str);