noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #64374 from RandomShaper/inheritable_cl_args

Browse Source
This commit is contained in:
Rémi Verschelde
2022-08-22 21:48:28 +02:00
committed by GitHub
parent 85cb22bd91 e886d662ec
commit 7c85c4a27e
8 changed files with 58 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/editor_node.cpp
+7 -4
View File
@@ -1822,15 +1822,15 @@ void EditorNode::restart_editor() {
List<String> args;
for (const String &a : Main::get_forwardable_cli_arguments(Main::CLI_SCOPE_TOOL)) {
args.push_back(a);
}
args.push_back("--path");
args.push_back(ProjectSettings::get_singleton()->get_resource_path());
args.push_back("-e");
if (OS::get_singleton()->is_disable_crash_handler()) {
args.push_back("--disable-crash-handler");
}
if (!to_reopen.is_empty()) {
args.push_back(to_reopen);
}
@@ -3183,6 +3183,9 @@ void EditorNode::_discard_changes(const String &p_str) {
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);
}
args.push_back("--path");
args.push_back(exec.get_base_dir());
args.push_back("--project-manager");