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

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.
This commit is contained in:
Rémi Verschelde 2018-09-10 14:53:31 +02:00
parent 0f6803ea77
commit c0df3b147e
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/main.cpp
View File

@ -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 // Determine if the project manager should be requested
project_manager = main_args.size() == 0 && !found_project; project_manager = main_args.size() == 0 && !found_project;
} }
if (project_manager) {
Engine::get_singleton()->set_editor_hint(true);
}
#endif #endif
if (main_args.size() == 0 && String(GLOBAL_DEF("application/run/main_scene", "")) == "") { if (main_args.size() == 0 && String(GLOBAL_DEF("application/run/main_scene", "")) == "") {
@ -1697,6 +1693,7 @@ bool Main::start() {
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
if (project_manager || (script == "" && test == "" && game_path == "" && !editor)) { if (project_manager || (script == "" && test == "" && game_path == "" && !editor)) {
Engine::get_singleton()->set_editor_hint(true);
ProjectManager *pmanager = memnew(ProjectManager); ProjectManager *pmanager = memnew(ProjectManager);
ProgressDialog *progress_dialog = memnew(ProgressDialog); ProgressDialog *progress_dialog = memnew(ProgressDialog);
pmanager->add_child(progress_dialog); pmanager->add_child(progress_dialog);