amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix encoding problem

Browse Source
This commit is contained in:
GenevensiS
2025-12-25 12:05:11 +01:00
parent b5cac4c6ef
commit 3d0f21d483
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/script/functions/json.cpp
+3 -1
View File
@@ -315,7 +315,9 @@ ScriptValueP json_to_mse(const boost::json::value& jv, Set* set) {
} }
else if (jv.is_string()) { else if (jv.is_string()) {
std::string string = boost::json::value_to<std::string>(jv); 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()) { else if (jv.is_array()) {
boost::json::array array = jv.get_array(); boost::json::array array = jv.get_array();
src/util/uid.hpp
+1 -3
View File
@@ -25,7 +25,5 @@ static String generate_uid() {
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
ss << dis(gen); ss << dis(gen);
}; };
//return ss.str(); return String(ss.str().c_str(), wxConvUTF8);
String wxString(ss.str().c_str(), wxConvUTF8);
return wxString;
} }