summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-07-17 15:45:14 +0200
committerRémi Verschelde <rverschelde@gmail.com>2024-07-17 15:45:14 +0200
commit0918fd2a213021e7bba4765c6398359c729d3fb4 (patch)
tree00f9f8e3221a099528bb56e9d8ca7e6469244ba0 /core
parentfa2266716e31f9dbf457a0bf5331611233240d21 (diff)
parentb18e1e0dcd883f9db64a17755dde33c7090e37c0 (diff)
downloadredot-engine-0918fd2a213021e7bba4765c6398359c729d3fb4.tar.gz
Merge pull request #94452 from jamie-pate/fix_73374
Fix game window stops responding when debugger pauses
Diffstat (limited to 'core')
-rw-r--r--core/debugger/remote_debugger.cpp3
-rw-r--r--core/os/os.h2
2 files changed, 2 insertions, 3 deletions
diff --git a/core/debugger/remote_debugger.cpp b/core/debugger/remote_debugger.cpp
index bd30da3047..e2ed7245a2 100644
--- a/core/debugger/remote_debugger.cpp
+++ b/core/debugger/remote_debugger.cpp
@@ -39,6 +39,7 @@
#include "core/io/resource_loader.h"
#include "core/object/script_language.h"
#include "core/os/os.h"
+#include "servers/display_server.h"
class RemoteDebugger::PerformanceProfiler : public EngineProfiler {
Object *performance = nullptr;
@@ -539,7 +540,7 @@ void RemoteDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) {
OS::get_singleton()->delay_usec(10000);
if (Thread::get_caller_id() == Thread::get_main_id()) {
// If this is a busy loop on the main thread, events still need to be processed.
- OS::get_singleton()->process_and_drop_events();
+ DisplayServer::get_singleton()->force_process_and_drop_events();
}
}
}
diff --git a/core/os/os.h b/core/os/os.h
index 63cc6ed50e..91e0ce9379 100644
--- a/core/os/os.h
+++ b/core/os/os.h
@@ -328,8 +328,6 @@ public:
virtual void benchmark_end_measure(const String &p_context, const String &p_what);
virtual void benchmark_dump();
- virtual void process_and_drop_events() {}
-
virtual Error setup_remote_filesystem(const String &p_server_host, int p_port, const String &p_password, String &r_project_path);
enum PreferredTextureFormat {