646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From 42f89dd50dde0896d6c55282c82db9af41cd12d8 Mon Sep 17 00:00:00 2001
|
|
From: David McFarland <corngood@gmail.com>
|
|
Date: Wed, 26 Mar 2025 09:52:17 -0300
|
|
Subject: [PATCH] CSharpLanguage: fix crash in reload_assemblies after editor
|
|
shutdown
|
|
|
|
---
|
|
modules/mono/csharp_script.cpp | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp
|
|
index 36c8a40ed9..2b161fb69b 100644
|
|
--- a/modules/mono/csharp_script.cpp
|
|
+++ b/modules/mono/csharp_script.cpp
|
|
@@ -1001,8 +1001,10 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) {
|
|
#ifdef TOOLS_ENABLED
|
|
// FIXME: Hack to refresh editor in order to display new properties and signals. See if there is a better alternative.
|
|
if (Engine::get_singleton()->is_editor_hint()) {
|
|
- InspectorDock::get_inspector_singleton()->update_tree();
|
|
- NodeDock::get_singleton()->update_lists();
|
|
+ if (InspectorDock::get_singleton())
|
|
+ InspectorDock::get_inspector_singleton()->update_tree();
|
|
+ if (NodeDock::get_singleton())
|
|
+ NodeDock::get_singleton()->update_lists();
|
|
}
|
|
#endif
|
|
}
|
|
--
|
|
2.48.1
|
|
|