DEV9: GHC related changes

PCSX2 · May 26, 2021 · af63023 · af63023
1 parent 0b51f09
commit af63023
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/pcsx2/DEV9/DEV9.cpp b/pcsx2/DEV9/DEV9.cpp
@@ -199,19 +199,14 @@ s32 DEV9open(void* pDsp)
 	DevCon.WriteLn("DEV9: open r+: %s", config.Hdd);
 #endif
 
-#ifdef _WIN32
-	ghc::filesystem::path hddPath(std::wstring(config.Hdd));
-#else
 	ghc::filesystem::path hddPath(config.Hdd);
-#endif
 
 	if (hddPath.empty())
 		config.hddEnable = false;
 
 	if (hddPath.is_relative())
 	{
-		//GHC uses UTF8 on all platforms
-		ghc::filesystem::path path(GetSettingsFolder().ToUTF8().data());
+		ghc::filesystem::path path(GetSettingsFolder().ToString().wx_str());
 		hddPath = path / hddPath;
 	}
 

diff --git a/pcsx2/DEV9/Linux/Linux.cpp b/pcsx2/DEV9/Linux/Linux.cpp
@@ -279,8 +279,7 @@ void OnOk()
 
 	if (hddPath.is_relative())
 	{
-		//GHC uses UTF8 on all platforms
-		ghc::filesystem::path path(GetSettingsFolder().ToUTF8().data());
+		ghc::filesystem::path path(GetSettingsFolder().ToString().wx_str());
 		hddPath = path / hddPath;
 	}
 

diff --git a/pcsx2/DEV9/Win32/Win32.cpp b/pcsx2/DEV9/Win32/Win32.cpp
@@ -218,8 +218,7 @@ void OnBrowse(HWND hW)
 	wchar_t wbuff[4096] = {0};
 	memcpy(wbuff, HDD_DEF, sizeof(HDD_DEF));
 
-	//GHC uses UTF8 on all platforms
-	ghc::filesystem::path inis = GetSettingsFolder().ToUTF8().data();
+	ghc::filesystem::path inis(GetSettingsFolder().ToString().wx_str());
 	wstring w_inis = inis.wstring();
 
 	OPENFILENAMEW ofn;