general: added last log entry to the unauthorized error dialog

stojy · Apr 30, 2023 · a317f39 · a317f39
1 parent 510e390
commit a317f39
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/ClrVpin/Cleaner/CleanerViewModel.cs b/ClrVpin/Cleaner/CleanerViewModel.cs
@@ -155,8 +155,8 @@ private async void Start()
         {
             progress?.Close();
             Logger.Error(e, "Cleaner");
-            await Notification.ShowWarning(HomeWindow.HomeDialogHost, "Cleaner Was Unsuccessful", "Please check that the folder is not read only and then try again.",
-                $"Error: {e.Message}\nDetails: refer to the log file.. ClrVpin.log");
+            await Notification.ShowWarning(HomeWindow.HomeDialogHost, "Cleaner Was Unsuccessful", "Access Error: please check that the folder is not read only and then try again.",
+                $"{Logger.GetLogs(1)}", showCloseButton:true);
             _window.Close();
         }
 

diff --git a/ClrVpin/Logging/Logger.cs b/ClrVpin/Logging/Logger.cs
@@ -115,9 +115,12 @@ private static string GetLogFile()
             return path;
         }
 
-        private static void Add(Level level, string message)
+        private static void Add(Level level, string message, bool sync = false)
         {
-            _dispatch.BeginInvoke(() => Logs.Add(new Log(level, message)));
+            if (!sync)
+                _dispatch.BeginInvoke(() => Logs.Add(new Log(level, message)));
+            else
+                _dispatch.Invoke(() => Logs.Add(new Log(level, message)));
         }
 
         private static readonly ILogger _logger = LogManager.GetCurrentClassLogger();

diff --git a/ClrVpin/Merger/MergerViewModel.cs b/ClrVpin/Merger/MergerViewModel.cs
@@ -222,8 +222,8 @@ private async void Start()
         {
             progress?.Close();
             Logger.Error(e, "Merger");
-            await Notification.ShowWarning(HomeWindow.HomeDialogHost, "Merger Was Unsuccessful", "Please check that the folder is not read only and then try again.",
-                $"Error: {e.Message}\nDetails: refer to the log file.. ClrVpin.log");
+            await Notification.ShowWarning(HomeWindow.HomeDialogHost, "Merger Was Unsuccessful", "Access Error: please check that the folder is not read only and then try again.",
+                $"{Logger.GetLogs(1)}", showCloseButton:true);
             _window.Close();
         }