Merge branch 'dev' of https://github.com/Regalis11/Barotrauma.git into Regalis11-dev

2021-12-16 12:46:42 -03:00
parent 82ed9ff2fb a864a98d4f
commit 9927b5370e
16 changed files with 78 additions and 33 deletions
@@ -2342,10 +2342,11 @@ namespace Barotrauma
                }
                if (e.InnerException != null)
                {
-                    error += "\n\nInner exception: " + e.InnerException.Message + "\n";
-                    if (e.InnerException.StackTrace != null)
+                    var innermost = e.GetInnermost();
+                    error += "\n\nInner exception: " + innermost.Message + "\n";
+                    if (innermost.StackTrace != null)
                    {
-                        error += e.InnerException.StackTrace.CleanupStackTrace(); ;
+                        error += innermost.StackTrace.CleanupStackTrace(); ;
                    }
                }
            }