From 3d0f21d4836178e173d74c36990338a053619671 Mon Sep 17 00:00:00 2001
From: GenevensiS <66968533+G-e-n-e-v-e-n-s-i-S@users.noreply.github.com>
Date: Thu, 25 Dec 2025 12:05:11 +0100
Subject: [PATCH] fix encoding problem

---
 src/script/functions/json.cpp | 4 +++-
 src/util/uid.hpp              | 4 +---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/script/functions/json.cpp b/src/script/functions/json.cpp
index db0eb272..3d402922 100644
--- a/src/script/functions/json.cpp
+++ b/src/script/functions/json.cpp
@@ -315,7 +315,9 @@ ScriptValueP json_to_mse(const boost::json::value& jv, Set* set) {
   }
   else if (jv.is_string()) {
     std::string string = boost::json::value_to<std::string>(jv);
-    return to_script(String(string.c_str()));
+    String wxstring = String(string.c_str(), wxConvUTF8);
+    if (wxstring.empty()) wxstring = String(string.c_str());
+    return to_script(wxstring);
   }
   else if (jv.is_array()) {
     boost::json::array array = jv.get_array();
diff --git a/src/util/uid.hpp b/src/util/uid.hpp
index b9c37def..b2b5329a 100644
--- a/src/util/uid.hpp
+++ b/src/util/uid.hpp
@@ -25,7 +25,5 @@ static String generate_uid() {
   for (i = 0; i < 32; i++) {
     ss << dis(gen);
   };
-  //return ss.str();
-  String wxString(ss.str().c_str(), wxConvUTF8);
-  return wxString;
+  return String(ss.str().c_str(), wxConvUTF8);
 }