Fix issue #235 Possible error loading/writing settings file

TumblThreeApp · Apr 19, 2022 · f220b82 · f220b82
1 parent 02ba1e6
commit f220b82
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/TumblThree/TumblThree.Applications/Controllers/ModuleController.cs b/src/TumblThree/TumblThree.Applications/Controllers/ModuleController.cs
@@ -160,13 +160,21 @@ public async void Run()
             await Dispatcher.CurrentDispatcher.InvokeAsync(ManagerController.RestoreColumn, DispatcherPriority.ApplicationIdle);
             await Dispatcher.CurrentDispatcher.InvokeAsync(QueueController.Run, DispatcherPriority.ApplicationIdle);
 
-            if (await CheckFor64BitVersion()) return;
+            if (await CheckFor64BitVersion())
+            {
+                _appSettings.TMLastCheck = DateTime.MinValue.ToUniversalTime();
+                return;
+            }
 
             if (_appSettings.LastUpdateCheck != DateTime.Today)
             {
                 var executingUpdate = await CheckForUpdatesComplete(_applicationUpdateService.GetLatestReleaseFromServer());
                 _appSettings.LastUpdateCheck = DateTime.Today;
-                if (executingUpdate) return;
+                if (executingUpdate)
+                {
+                    _appSettings.TMLastCheck = DateTime.MinValue.ToUniversalTime();
+                    return;
+                }
             }
 
             await CheckForTMData();

diff --git a/src/TumblThree/TumblThree.Applications/Properties/AppSettings.cs b/src/TumblThree/TumblThree.Applications/Properties/AppSettings.cs
@@ -435,6 +435,11 @@ public static bool Upgrade(AppSettings settings)
                 settings.LastUpdateCheck = new DateTime(1970, 1, 1);
                 updated = true;
             }
+            if (settings.TMLastCheck == new DateTime(1, 1, 1))
+            {
+                settings.TMLastCheck = new DateTime(1970, 1, 1);
+                updated = true;
+            }
 
             if (settings.ColumnSettings.Count > 0 && settings.ColumnSettings.ContainsKey("Date Added"))
             {
@@ -593,6 +598,7 @@ private void Initialize()
             GroupPhotoSets = false;
             FilenameTemplate = "%f";
             LastUpdateCheck = new DateTime(1970, 1, 1);
+            TMLastCheck = new DateTime(1970, 1, 1);
             Language = "en-US";
             ColumnSettings = new Dictionary<object, Tuple<int, double, Visibility>>();
         }