swap_lib: changed return type from const char* to std::string

khanghugo · Mar 13, 2024 · 4c8a6d8 · 4c8a6d8
1 parent 63654a1
commit 4c8a6d8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/BunnymodXT/helper_functions.cpp b/BunnymodXT/helper_functions.cpp
@@ -14,7 +14,7 @@ namespace helper_functions
 		#endif
 	}
 
-	const char *swap_lib(const char* current_lib_path, std::string new_lib_path, const char *start)
+	std::string swap_lib(const char* current_lib_path, std::string new_lib_path, const char *start)
 	{
 		const std::string filename = current_lib_path;
 		const auto index = filename.find(start);
@@ -25,10 +25,9 @@ namespace helper_functions
 
 		com_fixslashes(new_lib_path);
 
-		static std::string new_path;
-		new_path = filename.substr(0, index) + new_lib_path + DLL_EXTENSION;
+		std::string new_path = filename.substr(0, index) + new_lib_path + DLL_EXTENSION;
 
-		return new_path.c_str();
+		return new_path;
 	}
 
 	void crash_if_failed(std::string str)

diff --git a/BunnymodXT/helper_functions.hpp b/BunnymodXT/helper_functions.hpp
@@ -11,6 +11,6 @@
 namespace helper_functions
 {
 	void com_fixslashes(std::string &str);
-	const char *swap_lib(const char* current_lib_path, std::string new_lib_path, const char *start);
+	std::string swap_lib(const char* current_lib_path, std::string new_lib_path, const char *start);
 	void crash_if_failed(std::string str);
 }
diff --git a/BunnymodXT/modules/HwDLL.cpp b/BunnymodXT/modules/HwDLL.cpp
@@ -8092,7 +8092,7 @@ HOOK_DEF_1(HwDLL, void, __cdecl, LoadThisDll, const char*, szDllFilename)
 			#endif
 
 			EngineDevMsg("[hw dll] Old path to game library: %s\n", szDllFilename);
-			szDllFilename = helper_functions::swap_lib(szDllFilename, cs_lib, "addons");
+			szDllFilename = helper_functions::swap_lib(szDllFilename, cs_lib, "addons").c_str();
 			EngineDevMsg("[hw dll] New path to game library: %s\n", szDllFilename);
 
 			if (!strcmp(szDllFilename, oldszDllFilename))