From 8e55ba1b47168f9fa193d33c1af4dacd04316da4 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 31 Mar 2025 19:06:10 +0800
Subject: [PATCH] enhance: avoid unhandled exceptions in timer

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/Repository.cs | 51 ++++++++++++++++++++----------------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 6ea41e04..6b1e439e 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -2513,30 +2513,37 @@ namespace SourceGit.ViewModels
 
         private void AutoFetchImpl(object sender)
         {
-            if (!_settings.EnableAutoFetch || _isAutoFetching)
-                return;
-
-            var lockFile = Path.Combine(_gitDir, "index.lock");
-            if (File.Exists(lockFile))
-                return;
-
-            var now = DateTime.Now;
-            var desire = _lastFetchTime.AddMinutes(_settings.AutoFetchInterval);
-            if (desire > now)
-                return;
-
-            var remotes = new List<string>();
-            lock (_lockRemotes)
+            try
             {
-                foreach (var remote in _remotes)
-                    remotes.Add(remote.Name);
-            }
+                if (!_settings.EnableAutoFetch || _isAutoFetching)
+                    return;
 
-            Dispatcher.UIThread.Invoke(() => IsAutoFetching = true);
-            foreach (var remote in remotes)
-                new Commands.Fetch(_fullpath, remote, false, false, null) { RaiseError = false }.Exec();
-            _lastFetchTime = DateTime.Now;
-            Dispatcher.UIThread.Invoke(() => IsAutoFetching = false);
+                var lockFile = Path.Combine(_gitDir, "index.lock");
+                if (File.Exists(lockFile))
+                    return;
+
+                var now = DateTime.Now;
+                var desire = _lastFetchTime.AddMinutes(_settings.AutoFetchInterval);
+                if (desire > now)
+                    return;
+
+                var remotes = new List<string>();
+                lock (_lockRemotes)
+                {
+                    foreach (var remote in _remotes)
+                        remotes.Add(remote.Name);
+                }
+
+                Dispatcher.UIThread.Invoke(() => IsAutoFetching = true);
+                foreach (var remote in remotes)
+                    new Commands.Fetch(_fullpath, remote, false, false, null) { RaiseError = false }.Exec();
+                _lastFetchTime = DateTime.Now;
+                Dispatcher.UIThread.Invoke(() => IsAutoFetching = false);
+            }
+            catch
+            {
+                // DO nothing, but prevent `System.AggregateException`
+            }
         }
 
         private string _fullpath = string.Empty;