godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #58173 from akien-mga/js-build-fix-is_project_manager

This commit is contained in:
Rémi Verschelde 2022-02-16 09:43:03 +01:00 committed by GitHub
parent dbb64e5705 f9629deade
commit a2e540f617
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
platform/javascript/javascript_main.cpp
View File

@ -28,6 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/ /*************************************************************************/
#include "core/config/engine.h"
#include "core/io/resource_loader.h" #include "core/io/resource_loader.h"
#include "main/main.h" #include "main/main.h"
#include "platform/javascript/display_server_javascript.h" #include "platform/javascript/display_server_javascript.h"
@ -94,7 +95,7 @@ extern EMSCRIPTEN_KEEPALIVE int godot_js_main(int argc, char *argv[]) {
Main::start(); Main::start();
os->get_main_loop()->initialize(); os->get_main_loop()->initialize();
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
if (Main::is_project_manager() && FileAccess::exists("/tmp/preload.zip")) { if (Engine::get_singleton()->is_project_manager_hint() && FileAccess::exists("/tmp/preload.zip")) {
PackedStringArray ps; PackedStringArray ps;
ps.push_back("/tmp/preload.zip"); ps.push_back("/tmp/preload.zip");
os->get_main_loop()->emit_signal(SNAME("files_dropped"), ps, -1); os->get_main_loop()->emit_signal(SNAME("files_dropped"), ps, -1);