asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #94880 from KoBeWi/never-before-seen_way_to_restart_editor

Browse source 
Call `restart_editor()` in `RUN_PROJECT_MANAGER`
This commit is contained in:
Rémi Verschelde 2024-10-04 22:42:56 +02:00
commit aa4077338b
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 11 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
editor/editor_node.cpp
View file

@ -1983,7 +1983,7 @@ void EditorNode::try_autosave() {
editor_data.save_editor_external_data(); editor_data.save_editor_external_data();
} }
void EditorNode::restart_editor() { void EditorNode::restart_editor(bool p_goto_project_manager) {
exiting = true; exiting = true;
if (project_run_bar->is_playing()) { if (project_run_bar->is_playing()) {
@ -1991,22 +1991,25 @@ void EditorNode::restart_editor() {
} }
String to_reopen; String to_reopen;
if (get_tree()->get_edited_scene_root()) { if (!p_goto_project_manager && get_tree()->get_edited_scene_root()) {
to_reopen = get_tree()->get_edited_scene_root()->get_scene_file_path(); to_reopen = get_tree()->get_edited_scene_root()->get_scene_file_path();
} }
_exit_editor(EXIT_SUCCESS); _exit_editor(EXIT_SUCCESS);
List<String> args; List<String> args;
for (const String &a : Main::get_forwardable_cli_arguments(Main::CLI_SCOPE_TOOL)) { for (const String &a : Main::get_forwardable_cli_arguments(Main::CLI_SCOPE_TOOL)) {
args.push_back(a); args.push_back(a);
} }
args.push_back("--path"); if (p_goto_project_manager) {
args.push_back(ProjectSettings::get_singleton()->get_resource_path()); args.push_back("--project-manager");
} else {
args.push_back("--path");
args.push_back(ProjectSettings::get_singleton()->get_resource_path());
args.push_back("-e"); args.push_back("-e");
}
if (!to_reopen.is_empty()) { if (!to_reopen.is_empty()) {
args.push_back(to_reopen); args.push_back(to_reopen);
@ -3402,23 +3405,7 @@ void EditorNode::_discard_changes(const String &p_str) {
} break; } break;
case RUN_PROJECT_MANAGER: { case RUN_PROJECT_MANAGER: {
project_run_bar->stop_playing(); restart_editor(true);
_exit_editor(EXIT_SUCCESS);
String exec = OS::get_singleton()->get_executable_path();
List<String> args;
for (const String &a : Main::get_forwardable_cli_arguments(Main::CLI_SCOPE_TOOL)) {
args.push_back(a);
}
String exec_base_dir = exec.get_base_dir();
if (!exec_base_dir.is_empty()) {
args.push_back("--path");
args.push_back(exec_base_dir);
}
args.push_back("--project-manager");
OS::get_singleton()->set_restart_on_exit(true, args);
} break; } break;
case RELOAD_CURRENT_PROJECT: { case RELOAD_CURRENT_PROJECT: {
restart_editor(); restart_editor();

2
editor/editor_node.h
View file

@ -926,7 +926,7 @@ public:
void save_scene_list(const HashSet<String> &p_scene_paths); void save_scene_list(const HashSet<String> &p_scene_paths);
void save_before_run(); void save_before_run();
void try_autosave(); void try_autosave();
void restart_editor(); void restart_editor(bool p_goto_project_manager = false);
void unload_editor_addons(); void unload_editor_addons();
void dim_editor(bool p_dimming); void dim_editor(bool p_dimming);