fix: NDMF console breaks when an extension context throws an exception

Closes: #445
bdunderscore · Oct 20, 2024 · b2ae8b2 · b2ae8b2
1 parent fdb96a6
commit b2ae8b2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,8 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - [#459] "Proxy object was destroyed improperly! Resetting pipeline..." error appears frequently
-
 - [#460] Preview system fails to recover when the primary proxy is destroyed
+- [#462] NDMF console fails to appear when an ExtensionContext throws an exception
 
 ### Changed
 

diff --git a/Editor/ErrorReporting/UI/ErrorReportWindow.cs b/Editor/ErrorReporting/UI/ErrorReportWindow.cs
@@ -263,7 +263,7 @@ private void UpdateContents()
                 _errorList.style.display = DisplayStyle.Flex;
                 _errorList.Clear();
 
-                var errors = _report.Errors.OrderBy(e => e.Plugin.DisplayName).ToList();
+                var errors = _report.Errors.OrderBy(e => e.Plugin?.DisplayName).ToList();
                 PluginBase lastPlugin = null;
 
                 foreach (var error in errors)

diff --git a/Editor/ErrorReporting/UI/GroupHeader.cs b/Editor/ErrorReporting/UI/GroupHeader.cs
@@ -21,7 +21,7 @@ public GroupHeader(PluginBase plugin)
             var titleElem = this.Q<Label>("group-title");
             var imageElem = this.Q<Image>("group-logo");
 
-            if (plugin.LogoTexture != null)
+            if (plugin?.LogoTexture != null)
             {
                 imageElem.image = plugin.LogoTexture;
                 titleElem.style.display = DisplayStyle.None;
@@ -36,10 +36,13 @@ public GroupHeader(PluginBase plugin)
                 imageElem.style.height = height;
 #endif
             }
-            else
+            else if (plugin != null)
             {
                 imageElem.style.display = DisplayStyle.None;
                 titleElem.text = plugin.DisplayName;
+            } else {
+                imageElem.style.display = DisplayStyle.None;
+                titleElem.text = "???";
             }
         }
     }