From 4bfc076739dcfdbf9b2166b837a4cf7cc75bc2d7 Mon Sep 17 00:00:00 2001
From: Vitalii Mikhailov <personal@aragas.org>
Date: Thu, 11 Apr 2024 20:18:14 +0300
Subject: [PATCH] Fix

---
 .../CrashReportHtml.cs                        | 38 +++++++++++--------
 ...GuiRenderer.4.InvolvedModulesAndPlugins.cs | 17 +++++----
 .../BUTR.CrashReport.Renderer.WinForms.csproj |  2 +-
 .../Utils/CrashReportModelUtils.cs            |  4 +-
 4 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/src/BUTR.CrashReport.Renderer.Html/CrashReportHtml.cs b/src/BUTR.CrashReport.Renderer.Html/CrashReportHtml.cs
index d488d58..0fa7ee2 100644
--- a/src/BUTR.CrashReport.Renderer.Html/CrashReportHtml.cs
+++ b/src/BUTR.CrashReport.Renderer.Html/CrashReportHtml.cs
@@ -222,16 +222,18 @@ private static void AddInvolvedModules(CrashReportModel crashReport, StringBuild
     {
         foreach (var involvedModule in crashReport.InvolvedModules.GroupBy(x => x.ModuleOrLoaderPluginId))
         {
-            sbMain.Append("<li>")
-                .Append("Module Id: ").Append("<b><a href='javascript:;' onclick='scrollToElement(\"").Append(involvedModule.Key).Append("\")'>").Append(involvedModule.Key).Append("</a></b>").Append("<br/>")
-                .Append("<ul>");
+            sbMain.Append("<li>");
+            sbMain.Append("Module Id: ").Append("<b><a href='javascript:;' onclick='scrollToElement(\"").Append(involvedModule.Key).Append("\")'>").Append(involvedModule.Key).Append("</a></b>");
 
+            sbMain.Append("<ul>");
             foreach (var involved in involvedModule)
             {
                 sbMain.Append("<li>");
                 sbMain.Append("Frame: ").Append(involved.EnhancedStacktraceFrameName.EscapeGenerics());
                 sbMain.Append("</li>");
             }
+            sbMain.Append("/<ul>");
+
             sbMain.Append("</li>");
         }
     }
@@ -239,30 +241,34 @@ private static void AddInvolvedPlugins(CrashReportModel crashReport, StringBuild
     {
         foreach (var involvedPlugin in crashReport.InvolvedLoaderPlugins.GroupBy(x => x.ModuleOrLoaderPluginId))
         {
-            sbMain.Append("<li>")
-                .Append("Plugin Id: ").Append("<b><a href='javascript:;' onclick='scrollToElement(\"").Append(involvedPlugin.Key).Append("\")'>").Append(involvedPlugin.Key).Append("</a></b>").Append("<br/>")
-                .Append("<ul>");
+            sbMain.Append("<li>");
+            sbMain.Append("Plugin Id: ").Append("<b><a href='javascript:;' onclick='scrollToElement(\"").Append(involvedPlugin.Key).Append("\")'>").Append(involvedPlugin.Key).Append("</a></b>");
 
+            sbMain.Append("<ul>");
             foreach (var involved in involvedPlugin)
             {
                 sbMain.Append("<li>");
                 sbMain.Append("Frame: ").Append(involved.EnhancedStacktraceFrameName.EscapeGenerics());
                 sbMain.Append("</li>");
             }
-            sbMain
-                .Append("</ul>")
-                .Append("</li>");
+            sbMain.Append("/<ul>");
+
+            sbMain.Append("</li>");
         }
     }
     private static string GetInvolvedHtml(CrashReportModel crashReport)
     {
-        var sb = new StringBuilder();
-        sb.Append("From highest probability to lowest:")
-            .Append("<ul>");
-        AddInvolvedModules(crashReport, sb);
-        AddInvolvedPlugins(crashReport, sb);
-        sb.Append("</ul>");
-        return sb.ToString();
+        if (crashReport.InvolvedModules.Count > 0 || crashReport.InvolvedLoaderPlugins.Count > 0)
+        {
+            var sb = new StringBuilder();
+            sb.Append("From highest probability to lowest:")
+                .Append("<ul>");
+            AddInvolvedModules(crashReport, sb);
+            AddInvolvedPlugins(crashReport, sb);
+            sb.Append("</ul>");
+            return sb.ToString();
+        }
+        return string.Empty;
     }
 
     private static string GetInstalledModulesHtml(CrashReportModel crashReport)
diff --git a/src/BUTR.CrashReport.Renderer.ImGui/Renderer/ImGuiRenderer.4.InvolvedModulesAndPlugins.cs b/src/BUTR.CrashReport.Renderer.ImGui/Renderer/ImGuiRenderer.4.InvolvedModulesAndPlugins.cs
index 99b86fe..c5c753e 100644
--- a/src/BUTR.CrashReport.Renderer.ImGui/Renderer/ImGuiRenderer.4.InvolvedModulesAndPlugins.cs
+++ b/src/BUTR.CrashReport.Renderer.ImGui/Renderer/ImGuiRenderer.4.InvolvedModulesAndPlugins.cs
@@ -41,7 +41,7 @@ private void RenderInvolvedModules()
 
                     _imgui.TextSameLine("Frame: \0"u8);
                     _imgui.Text(involved.EnhancedStacktraceFrameName);
-                    
+
                     _imgui.Unindent();
                 }
 
@@ -66,7 +66,7 @@ private void RenderInvolvedPlugins()
 
                     _imgui.TextSameLine("Frame: \0"u8);
                     _imgui.Text(involved.EnhancedStacktraceFrameName);
-                    
+
                     _imgui.Unindent();
                 }
 
@@ -77,10 +77,13 @@ private void RenderInvolvedPlugins()
 
     private void RenderInvolvedModulesAndPlugins()
     {
-        _imgui.Text("From highest probability to lowest:\0"u8);
-        _imgui.Indent();
-        RenderInvolvedModules();
-        RenderInvolvedPlugins();
-        _imgui.Unindent();
+        if (_enhancedStacktraceGroupedByModuleId.Length > 0 || _enhancedStacktraceGroupedByLoaderPluginIdId.Length > 0)
+        {
+            _imgui.Text("From highest probability to lowest:\0"u8);
+            _imgui.Indent();
+            RenderInvolvedModules();
+            RenderInvolvedPlugins();
+            _imgui.Unindent();
+        }
     }
 }
\ No newline at end of file
diff --git a/src/BUTR.CrashReport.Renderer.WinForms/BUTR.CrashReport.Renderer.WinForms.csproj b/src/BUTR.CrashReport.Renderer.WinForms/BUTR.CrashReport.Renderer.WinForms.csproj
index c045836..9f1646f 100644
--- a/src/BUTR.CrashReport.Renderer.WinForms/BUTR.CrashReport.Renderer.WinForms.csproj
+++ b/src/BUTR.CrashReport.Renderer.WinForms/BUTR.CrashReport.Renderer.WinForms.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net45;netcoreapp3.0;net5.0-windows;</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
     <LangVersion>preview</LangVersion>
diff --git a/src/BUTR.CrashReport/Utils/CrashReportModelUtils.cs b/src/BUTR.CrashReport/Utils/CrashReportModelUtils.cs
index b4381d7..978c7a5 100644
--- a/src/BUTR.CrashReport/Utils/CrashReportModelUtils.cs
+++ b/src/BUTR.CrashReport/Utils/CrashReportModelUtils.cs
@@ -161,7 +161,7 @@ public static List<InvolvedModuleOrPluginModel> GetInvolvedModules(CrashReportIn
             foreach (var patch in stacktrace.PatchMethods)
             {
                 if (patch.ModuleInfo is null) continue;
-                
+
                 involvedModels.Add(new()
                 {
                     ModuleOrLoaderPluginId = patch.ModuleInfo.Id,
@@ -196,7 +196,7 @@ public static List<InvolvedModuleOrPluginModel> GetInvolvedPlugins(CrashReportIn
             foreach (var patch in stacktrace.PatchMethods)
             {
                 if (patch.LoaderPluginInfo is null) continue;
-                
+
                 involvedPluginModels.Add(new()
                 {
                     ModuleOrLoaderPluginId = patch.LoaderPluginInfo.Id,