summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-09-26 13:45:23 +0200
committerRémi Verschelde <rverschelde@gmail.com>2023-09-26 13:45:23 +0200
commit666a92c7c2bf449a69234268982ff47eda828444 (patch)
tree756e304efa99be53fc3f2e2e492ac572a17af8d8
parent42011d8673efa9d60725fa980b43d905d6a5c330 (diff)
parent0b0a6109b6d8974899691fd1dd883eca994b769f (diff)
downloadredot-engine-666a92c7c2bf449a69234268982ff47eda828444.tar.gz
Merge pull request #82244 from SaracenOne/fix_dependency_error_popup
Fix missing dependency warning popup
-rw-r--r--core/io/resource_loader.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/io/resource_loader.h b/core/io/resource_loader.h
index 0c7d6c0feb..3c32a19066 100644
--- a/core/io/resource_loader.h
+++ b/core/io/resource_loader.h
@@ -230,7 +230,11 @@ public:
// Loaders can safely use this regardless which thread they are running on.
static void notify_dependency_error(const String &p_path, const String &p_dependency, const String &p_type) {
if (dep_err_notify) {
- callable_mp_static(dep_err_notify).bind(p_path, p_dependency, p_type).call_deferred();
+ if (Thread::get_caller_id() == Thread::get_main_id()) {
+ dep_err_notify(p_path, p_dependency, p_type);
+ } else {
+ callable_mp_static(dep_err_notify).bind(p_path, p_dependency, p_type).call_deferred();
+ }
}
}
static void set_dependency_error_notify_func(DependencyErrorNotify p_err_notify) {