godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

C#: Fix crash when errors occur before language initialization.

Browse Source 
(cherry picked from commit c0ebc28136)
This commit is contained in:
RedworkDE 2023-02-28 22:08:19 +01:00 committed by Yuri Sizov
parent 234c601a61
commit 0112862e70
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/mono/csharp_script.cpp
View File

@ -581,7 +581,7 @@ Vector<ScriptLanguage::StackInfo> CSharpLanguage::debug_get_current_stack_info()
_recursion_flag_ = false; _recursion_flag_ = false;
}; };
if (!gdmono->is_runtime_initialized()) { if (!gdmono || !gdmono->is_runtime_initialized()) {
return Vector<StackInfo>(); return Vector<StackInfo>();
} }
@ -671,6 +671,7 @@ void CSharpLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_soft
#ifdef GD_MONO_HOT_RELOAD #ifdef GD_MONO_HOT_RELOAD
bool CSharpLanguage::is_assembly_reloading_needed() { bool CSharpLanguage::is_assembly_reloading_needed() {
ERR_FAIL_NULL_V(gdmono, false);
if (!gdmono->is_runtime_initialized()) { if (!gdmono->is_runtime_initialized()) {
return false; return false;
} }
@ -705,6 +706,7 @@ bool CSharpLanguage::is_assembly_reloading_needed() {
} }
void CSharpLanguage::reload_assemblies(bool p_soft_reload) { void CSharpLanguage::reload_assemblies(bool p_soft_reload) {
ERR_FAIL_NULL(gdmono);
if (!gdmono->is_runtime_initialized()) { if (!gdmono->is_runtime_initialized()) {
return; return;
} }