summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorMax Hilbrunner <mhilbrunner@users.noreply.github.com>2018-07-05 00:27:08 +0200
committerGitHub <noreply@github.com>2018-07-05 00:27:08 +0200
commitdc2d8d4dee22ca870dffb7a7a4508dabb18a9988 (patch)
tree5a33a53976ae83ccc4b0d5e8fb83c6abfad64dba /main
parenta8a318161bec25bf6e1c1a0421a255f017d9f41b (diff)
parent2fcbf9dd8105940cefecb9c1d666bf3002869996 (diff)
Merge pull request #19229 from RandomShaper/fix-focus-steal
Fix debugger focus stealing
Diffstat (limited to 'main')
-rw-r--r--main/main.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/main/main.cpp b/main/main.cpp
index e2b3bb8e6f..23acb60c89 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -715,6 +715,7 @@ 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") {
@@ -1179,10 +1180,6 @@ Error Main::setup2(Thread::ID p_main_tid_override) {
#endif
- if (allow_focus_steal_pid) {
- OS::get_singleton()->enable_for_stealing_focus(allow_focus_steal_pid);
- }
-
MAIN_PRINT("Main: Load Modules, Physics, Drivers, Scripts");
register_platform_apis();