diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-07-15 16:20:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-15 16:20:17 +0200 |
| commit | 9427bf38427da6366118bfd21fbb2f064bc5719d (patch) | |
| tree | b59c578509f8cf4af394bf1c9d79646c3b67f879 /platform/javascript/os_javascript.cpp | |
| parent | 64fb4fac89ddc51f35a3e727783f4f40dc9eca8f (diff) | |
| parent | 9a044d95fc7374e10088bc33abf7909027e02b75 (diff) | |
| download | redot-engine-9427bf38427da6366118bfd21fbb2f064bc5719d.tar.gz | |
Merge pull request #50480 from Faless/js/4.x_ci
Diffstat (limited to 'platform/javascript/os_javascript.cpp')
| -rw-r--r-- | platform/javascript/os_javascript.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/platform/javascript/os_javascript.cpp b/platform/javascript/os_javascript.cpp index 92b8b70508..260bfad7a5 100644 --- a/platform/javascript/os_javascript.cpp +++ b/platform/javascript/os_javascript.cpp @@ -31,7 +31,6 @@ #include "os_javascript.h" #include "core/debugger/engine_debugger.h" -#include "core/io/json.h" #include "drivers/unix/dir_access_unix.h" #include "drivers/unix/file_access_unix.h" #include "main/main.h" @@ -115,7 +114,7 @@ Error OS_JavaScript::create_process(const String &p_path, const List<String> &p_ for (const List<String>::Element *E = p_arguments.front(); E; E = E->next()) { args.push_back(E->get()); } - String json_args = JSON::print(args); + String json_args = Variant(args).to_json_string(); int failed = godot_js_os_execute(json_args.utf8().get_data()); ERR_FAIL_COND_V_MSG(failed, ERR_UNAVAILABLE, "OS::execute() or create_process() must be implemented in JavaScript via 'engine.setOnExecute' if required."); return OK; |