diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2021-07-07 16:42:48 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-07 16:42:48 +0200 |
commit | 56d712686496845cab3bfd6a6ed67e4efc2c39d5 (patch) | |
tree | 32b97d813608af4dcf635553dc3b2603f38be71b /platform/javascript/javascript_singleton.cpp | |
parent | 48a52268291d2dc48377c51f1b43e0a9d830057e (diff) | |
parent | d4e302a3a499b4a3445b4e1610757fc310d1641d (diff) | |
download | redot-engine-56d712686496845cab3bfd6a6ed67e4efc2c39d5.tar.gz |
Merge pull request #50247 from Faless/js/if_fix
[HTML5] Fix JavaScript string parsing with new interface.
Diffstat (limited to 'platform/javascript/javascript_singleton.cpp')
-rw-r--r-- | platform/javascript/javascript_singleton.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/javascript/javascript_singleton.cpp b/platform/javascript/javascript_singleton.cpp index 9de2edc9a7..1dd73ef8e9 100644 --- a/platform/javascript/javascript_singleton.cpp +++ b/platform/javascript/javascript_singleton.cpp @@ -183,7 +183,7 @@ Variant JavaScriptObjectImpl::_js2variant(int p_type, godot_js_wrapper_ex *p_val case Variant::FLOAT: return p_val->r; case Variant::STRING: { - String out((const char *)p_val->p); + String out = String::utf8((const char *)p_val->p); free(p_val->p); return out; } |