diff options
| -rw-r--r-- | core/script_debugger_remote.cpp | 8 | ||||
| -rw-r--r-- | core/script_debugger_remote.h | 4 | ||||
| -rw-r--r-- | main/main.cpp | 5 |
3 files changed, 4 insertions, 13 deletions
diff --git a/core/script_debugger_remote.cpp b/core/script_debugger_remote.cpp index ee6133f374..9780cc48ea 100644 --- a/core/script_debugger_remote.cpp +++ b/core/script_debugger_remote.cpp @@ -139,10 +139,6 @@ void ScriptDebuggerRemote::debug(ScriptLanguage *p_script, bool p_can_continue) ERR_FAIL(); } - if (allow_focus_steal_pid) { - OS::get_singleton()->enable_for_stealing_focus(allow_focus_steal_pid); - } - packet_peer_stream->put_var("debug_enter"); packet_peer_stream->put_var(2); packet_peer_stream->put_var(p_can_continue); @@ -1058,9 +1054,6 @@ void ScriptDebuggerRemote::profiling_set_frame_times(float p_frame_time, float p physics_frame_time = p_physics_frame_time; } -void ScriptDebuggerRemote::set_allow_focus_steal_pid(OS::ProcessID p_pid) { - allow_focus_steal_pid = p_pid; -} ScriptDebuggerRemote::ResourceUsageFunc ScriptDebuggerRemote::resource_usage_func = NULL; @@ -1083,7 +1076,6 @@ ScriptDebuggerRemote::ScriptDebuggerRemote() : char_count(0), last_msec(0), msec_count(0), - allow_focus_steal_pid(0), locking(false), poll_every(0), request_scene_tree(NULL), diff --git a/core/script_debugger_remote.h b/core/script_debugger_remote.h index 7afc90428d..1fc9d7c7f1 100644 --- a/core/script_debugger_remote.h +++ b/core/script_debugger_remote.h @@ -99,8 +99,6 @@ class ScriptDebuggerRemote : public ScriptDebugger { uint64_t last_msec; uint64_t msec_count; - OS::ProcessID allow_focus_steal_pid; - bool locking; //hack to avoid a deadloop static void _print_handler(void *p_this, const String &p_string, bool p_error); @@ -174,8 +172,6 @@ public: virtual void profiling_end(); virtual void profiling_set_frame_times(float p_frame_time, float p_idle_time, float p_physics_time, float p_physics_frame_time); - void set_allow_focus_steal_pid(OS::ProcessID p_pid); - ScriptDebuggerRemote(); ~ScriptDebuggerRemote(); }; diff --git a/main/main.cpp b/main/main.cpp index ee13a4bacc..b52e03add3 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -788,7 +788,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph memdelete(sdr); } else { script_debugger = sdr; - sdr->set_allow_focus_steal_pid(allow_focus_steal_pid); } } else if (debug_mode == "local") { @@ -1129,6 +1128,10 @@ Error Main::setup2(Thread::ID p_main_tid_override) { OS::get_singleton()->set_window_always_on_top(true); } + if (allow_focus_steal_pid) { + OS::get_singleton()->enable_for_stealing_focus(allow_focus_steal_pid); + } + register_server_types(); MAIN_PRINT("Main: Load Remaps"); |