summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2021-02-04 14:53:31 +0100
committerGitHub <noreply@github.com>2021-02-04 14:53:31 +0100
commit5e0f3f1fe10f33a9ab9f09976cdc9a687a9f3bfd (patch)
tree701e74cfa1b8e136ef563b0520d9a29e4efcd7b5 /platform
parent59ae3ea44fb205a6ba1ae1336833c9fbb186b1df (diff)
parent95d210256524e08743870ed49f16162348d87a0d (diff)
Merge pull request #45705 from Faless/js/4.x_editor_preload
[HTML5] Better editor persistent folders, automatically open zip import popup
Diffstat (limited to 'platform')
-rw-r--r--platform/javascript/javascript_main.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/platform/javascript/javascript_main.cpp b/platform/javascript/javascript_main.cpp
index 0b8af70b13..0fe95b0a8f 100644
--- a/platform/javascript/javascript_main.cpp
+++ b/platform/javascript/javascript_main.cpp
@@ -88,6 +88,13 @@ extern EMSCRIPTEN_KEEPALIVE int godot_js_main(int argc, char *argv[]) {
Main::start();
os->get_main_loop()->initialize();
+#ifdef TOOLS_ENABLED
+ if (Main::is_project_manager() && FileAccess::exists("/tmp/preload.zip")) {
+ PackedStringArray ps;
+ ps.push_back("/tmp/preload.zip");
+ os->get_main_loop()->emit_signal("files_dropped", ps, -1);
+ }
+#endif
emscripten_set_main_loop(main_loop_callback, -1, false);
// Immediately run the first iteration.
// We are inside an animation frame, we want to immediately draw on the newly setup canvas.