Show plugin log more reliably

MarkMpn · Nov 3, 2023 · 624e423 · 624e423
1 parent 57af6c5
commit 624e423
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/MarkMpn.Sql4Cds.XTB/SqlQueryControl.cs b/MarkMpn.Sql4Cds.XTB/SqlQueryControl.cs
@@ -829,19 +829,25 @@ private string GetErrorMessage(Exception error)
                 if (fault.Message != error.Message)
                     msg += "\r\n" + fault.Message;
 
+                if (fault.ErrorDetails.TryGetValue("Plugin.ExceptionFromPluginExecute", out var plugin))
+                    msg += "\r\nError from plugin: " + plugin;
+
+                if (!String.IsNullOrEmpty(fault.TraceText))
+                    msg += "\r\nTrace log: " + fault.TraceText;
+
                 while (fault.InnerFault != null)
                 {
                     if (fault.InnerFault.Message != fault.Message)
                         msg += "\r\n" + fault.InnerFault.Message;
 
                     fault = fault.InnerFault;
-                }
 
-                if (fault.ErrorDetails.TryGetValue("Plugin.ExceptionFromPluginExecute", out var plugin))
-                    msg += "\r\nError from plugin: " + plugin;
+                    if (fault.ErrorDetails.TryGetValue("Plugin.ExceptionFromPluginExecute", out plugin))
+                        msg += "\r\nError from plugin: " + plugin;
 
-                if (!String.IsNullOrEmpty(fault.TraceText))
-                    msg += "\r\nTrace log: " + fault.TraceText;
+                    if (!String.IsNullOrEmpty(fault.TraceText))
+                        msg += "\r\nTrace log: " + fault.TraceText;
+                }
             }
 
             return msg;