diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-07-09 11:07:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-09 11:07:31 +0200 |
| commit | 3169fe75e8b62a77c07ff5e088c3d197852d8189 (patch) | |
| tree | 1240430c13a71d978e540fb98067c2479eb9211b | |
| parent | d629b17291347b20ef3730f97f484e807ac07f1a (diff) | |
| parent | b2d27214aa0bee3cf0dc091846bf087e007c9607 (diff) | |
Merge pull request #40225 from nekomatata/keep-command-line-options
Keep debug & verbose options after loading project from project manager
| -rw-r--r-- | core/os/os.cpp | 4 | ||||
| -rw-r--r-- | core/os/os.h | 2 | ||||
| -rw-r--r-- | editor/project_manager.cpp | 8 | ||||
| -rw-r--r-- | main/main.cpp | 1 |
4 files changed, 15 insertions, 0 deletions
diff --git a/core/os/os.cpp b/core/os/os.cpp index 231069fcfb..dc8bd5ee69 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -163,6 +163,10 @@ bool OS::is_stdout_verbose() const { return _verbose_stdout; } +bool OS::is_stdout_debug_enabled() const { + return _debug_stdout; +} + void OS::dump_memory_to_file(const char *p_file) { //Memory::dump_static_mem_to_file(p_file); } diff --git a/core/os/os.h b/core/os/os.h index f21c0d4df7..48dae99188 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -50,6 +50,7 @@ class OS { bool low_processor_usage_mode = false; int low_processor_usage_mode_sleep_usec = 10000; bool _verbose_stdout = false; + bool _debug_stdout = false; String _local_clipboard; uint64_t _msec_splash; bool _no_window = false; @@ -222,6 +223,7 @@ public: virtual bool is_userfs_persistent() const { return true; } bool is_stdout_verbose() const; + bool is_stdout_debug_enabled() const; virtual void disable_crash_handler() {} virtual bool is_disable_crash_handler() const { return false; } diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index 5184793760..1880fd5112 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -2004,6 +2004,14 @@ void ProjectManager::_open_selected_projects() { 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()) { args.push_back("--disable-crash-handler"); } diff --git a/main/main.cpp b/main/main.cpp index 4ea11cfaeb..7492d3d6c9 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -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") { debug_uri = "local://"; + OS::get_singleton()->_debug_stdout = true; #if defined(DEBUG_ENABLED) && !defined(SERVER_ENABLED) } else if (I->get() == "--debug-collisions") { debug_collisions = true; |