Fix GraphicPacks load failed if use utf8 exe path

cemu-project · Oct 29, 2023 · c2d4b5b · c2d4b5b
1 parent f3c95f7
commit c2d4b5b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Cafe/GraphicPack/GraphicPack2.cpp b/src/Cafe/GraphicPack/GraphicPack2.cpp
@@ -12,6 +12,7 @@
 #include "util/helpers/StringHelpers.h"
 #include "Cafe/CafeSystem.h"
 #include <cinttypes>
+#include "gui/wxHelper.h"
 
 std::vector<GraphicPackPtr> GraphicPack2::s_graphic_packs;
 std::vector<GraphicPackPtr> GraphicPack2::s_active_graphic_packs;
@@ -89,12 +90,12 @@ bool GraphicPack2::LoadGraphicPack(const std::string& filename, IniParser& rules
 		const auto& config_entries = g_config.data().graphic_pack_entries;
 
 		// legacy absolute path checking for not breaking compatibility
-		auto file = gp->GetFilename2();
+		auto file = wxHelper::MakeFSPath(gp->GetFilename());
 		auto it = config_entries.find(file.lexically_normal());
 		if (it == config_entries.cend())
 		{
 			// check for relative path
-			it = config_entries.find(MakeRelativePath(ActiveSettings::GetUserDataPath(), gp->GetFilename2()).lexically_normal());
+			it = config_entries.find(MakeRelativePath(ActiveSettings::GetUserDataPath(), wxHelper::FromUtf8(gp->GetFilename()).ToStdString()).lexically_normal());
 		}
 
 		if (it != config_entries.cend())
@@ -650,7 +651,7 @@ bool GraphicPack2::SetActivePreset(std::string_view category, std::string_view n
 
 void GraphicPack2::LoadShaders()
 {
-	fs::path path(m_filename);
+	fs::path path(wxHelper::FromUtf8(m_filename).ToStdString());
 	for (auto& it : fs::directory_iterator(path.remove_filename()))
 	{
 		if (!is_regular_file(it))

diff --git a/src/gui/wxHelper.h b/src/gui/wxHelper.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <wx/string.h>
+#include <wx/colour.h>
 
 namespace wxHelper
 {