From d3e212486bc336c883805b91f805ebc2aed74c59 Mon Sep 17 00:00:00 2001
From: Filip Sykala - NTB T15p <Filip.Sykala@prusa3d.cz>
Date: Thu, 23 Feb 2023 12:01:26 +0100
Subject: [PATCH] Try to fix conversion from uri to string path
 'file://System/Library/Fonts/Helvetica.ttc#postscript-name=Helvetica' ->
 '/System/Library/Fonts/Helvetica.ttc'

---
 src/slic3r/Utils/WxFontUtils.cpp | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/slic3r/Utils/WxFontUtils.cpp b/src/slic3r/Utils/WxFontUtils.cpp
index a56f331412..cf1939b13d 100644
--- a/src/slic3r/Utils/WxFontUtils.cpp
+++ b/src/slic3r/Utils/WxFontUtils.cpp
@@ -43,6 +43,20 @@ static bool is_valid_ttf(std::string_view file_path)
     return true;
 }
 
+static std::string get_path_from_file_uri(const wxString &file_uri)
+{
+    wxURI uri(file_uri);
+    const wxString &path = uri.GetPath();
+    BOOST_LOG_TRIVIAL(trace) << "input uri(" << file_uri.c_str() << ") convert to path(" << path.c_str() << ").";
+    std::string file_path(path.c_str());
+    size_t start = std::string("file://").size();
+    if (file_path.empty() || file_path.size() <= start)
+        return {};
+    // remove prefix file://
+    file_path = file_path.substr(start, file_path.size() - start);
+    return file_path;
+}
+
 // get filepath from wxFont on Mac OsX
 static std::string get_file_path(const wxFont& font) {
     const wxNativeFontInfo *info = font.GetNativeFontInfo();
@@ -55,13 +69,7 @@ static std::string get_file_path(const wxFont& font) {
     if (url == NULL) return {};
     wxString file_uri;
     wxCFTypeRef(url).GetValue(file_uri);
-    std::string file_path(wxURI::Unescape(file_uri).c_str());
-    size_t start = std::string("file://").size();
-    if (file_path.empty() || file_path.size() <= start)
-        return {};
-    // remove prefix file://
-    file_path = file_path.substr(start, file_path.size() - start);
-    return file_path;
+    return get_path_from_file_uri(file_uri);    
 }    
 #endif // __APPLE__
 } // namespace