From c0df3b147e59199fa3d7743f89c167a440daa070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Mon, 10 Sep 2018 14:53:31 +0200 Subject: [PATCH] Make sure project manager gets editor hint set Previous fix in e8e06b2 worked in most cases but not if you run e.g. 'godot -', where the '-' argument would mean that 'project_manager' is false and yet that's what will be opened eventually. --- main/main.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/main/main.cpp b/main/main.cpp index a50a8827cdc..96d00be737c 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -792,10 +792,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph // Determine if the project manager should be requested project_manager = main_args.size() == 0 && !found_project; } - - if (project_manager) { - Engine::get_singleton()->set_editor_hint(true); - } #endif if (main_args.size() == 0 && String(GLOBAL_DEF("application/run/main_scene", "")) == "") { @@ -1697,6 +1693,7 @@ bool Main::start() { #ifdef TOOLS_ENABLED if (project_manager || (script == "" && test == "" && game_path == "" && !editor)) { + Engine::get_singleton()->set_editor_hint(true); ProjectManager *pmanager = memnew(ProjectManager); ProgressDialog *progress_dialog = memnew(ProgressDialog); pmanager->add_child(progress_dialog);