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

Merge pull request #40225 from nekomatata/keep-command-line-options 

Keep debug & verbose options after loading project from project manager
This commit is contained in:
Rémi Verschelde 2020-07-09 11:07:31 +02:00 committed by GitHub
parent d629b17291 b2d27214aa
commit 3169fe75e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/os/os.cpp
View File

@ -163,6 +163,10 @@ bool OS::is_stdout_verbose() const {
return _verbose_stdout; return _verbose_stdout;
} }
bool OS::is_stdout_debug_enabled() const {
return _debug_stdout;
}
void OS::dump_memory_to_file(const char *p_file) { void OS::dump_memory_to_file(const char *p_file) {
//Memory::dump_static_mem_to_file(p_file); //Memory::dump_static_mem_to_file(p_file);
} }

2
core/os/os.h
View File

@ -50,6 +50,7 @@ class OS {
bool low_processor_usage_mode = false; bool low_processor_usage_mode = false;
int low_processor_usage_mode_sleep_usec = 10000; int low_processor_usage_mode_sleep_usec = 10000;
bool _verbose_stdout = false; bool _verbose_stdout = false;
bool _debug_stdout = false;
String _local_clipboard; String _local_clipboard;
uint64_t _msec_splash; uint64_t _msec_splash;
bool _no_window = false; bool _no_window = false;
@ -222,6 +223,7 @@ public:
virtual bool is_userfs_persistent() const { return true; } virtual bool is_userfs_persistent() const { return true; }
bool is_stdout_verbose() const; bool is_stdout_verbose() const;
bool is_stdout_debug_enabled() const;
virtual void disable_crash_handler() {} virtual void disable_crash_handler() {}
virtual bool is_disable_crash_handler() const { return false; } virtual bool is_disable_crash_handler() const { return false; }

8
editor/project_manager.cpp
View File

@ -2004,6 +2004,14 @@ void ProjectManager::_open_selected_projects() {
args.push_back("--editor"); args.push_back("--editor");
if (OS::get_singleton()->is_stdout_debug_enabled()) {
args.push_back("--debug");
}
if (OS::get_singleton()->is_stdout_verbose()) {
args.push_back("--verbose");
}
if (OS::get_singleton()->is_disable_crash_handler()) { if (OS::get_singleton()->is_disable_crash_handler()) {
args.push_back("--disable-crash-handler"); args.push_back("--disable-crash-handler");
} }

1
main/main.cpp
View File

@ -836,6 +836,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
} else if (I->get() == "-d" || I->get() == "--debug") { } else if (I->get() == "-d" || I->get() == "--debug") {
debug_uri = "local://"; debug_uri = "local://";
OS::get_singleton()->_debug_stdout = true;
#if defined(DEBUG_ENABLED) && !defined(SERVER_ENABLED) #if defined(DEBUG_ENABLED) && !defined(SERVER_ENABLED)
} else if (I->get() == "--debug-collisions") { } else if (I->get() == "--debug-collisions") {
debug_collisions = true; debug_collisions = true;