From 8102ae64221e5fc4838ee297037d275d69693c5d Mon Sep 17 00:00:00 2001
From: goat <fakecake@icloud.com>
Date: Mon, 13 Jan 2020 23:16:18 +0900
Subject: [PATCH] feat: add log level to log window

---
 Dalamud/Interface/DalamudLogWindow.cs | 1 -
 Dalamud/Interface/SerilogEventSink.cs | 8 ++++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Dalamud/Interface/DalamudLogWindow.cs b/Dalamud/Interface/DalamudLogWindow.cs
index da3676290..5d49c961a 100644
--- a/Dalamud/Interface/DalamudLogWindow.cs
+++ b/Dalamud/Interface/DalamudLogWindow.cs
@@ -58,7 +58,6 @@ namespace Dalamud.Interface
             var clear = ImGui.Button("Clear");
             ImGui.SameLine();
             var copy = ImGui.Button("Copy");
-            ImGui.SameLine();
 
             ImGui.BeginChild("scrolling", new Vector2(0, 0), false, ImGuiWindowFlags.HorizontalScrollbar);
 
diff --git a/Dalamud/Interface/SerilogEventSink.cs b/Dalamud/Interface/SerilogEventSink.cs
index b67825bb0..3e0f7d2d2 100644
--- a/Dalamud/Interface/SerilogEventSink.cs
+++ b/Dalamud/Interface/SerilogEventSink.cs
@@ -27,8 +27,12 @@ namespace Dalamud.Interface
 
         public void Emit(LogEvent logEvent)
         {
-            var message = logEvent.RenderMessage(_formatProvider);
-            OnLogLine?.Invoke(this, $"[{DateTimeOffset.Now.ToString()}][{logEvent.Level}] {message}");
+            var message = $"[{DateTimeOffset.Now.ToString()}][{logEvent.Level}] {logEvent.RenderMessage(_formatProvider)}";
+
+            if (logEvent.Exception != null)
+                message += "\n" + logEvent.Exception;
+
+            OnLogLine?.Invoke(this, message);
         }
     }