From 6a1994b850b30889459e650629ed9e1357e8abac Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Tue, 6 Nov 2018 21:24:46 -0500
Subject: fix crash log deleted immediately on game relaunch

---
 src/SMAPI/Framework/SCore.cs | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

(limited to 'src/SMAPI/Framework')

diff --git a/src/SMAPI/Framework/SCore.cs b/src/SMAPI/Framework/SCore.cs
index e76e7a1d..3e8766c2 100644
--- a/src/SMAPI/Framework/SCore.cs
+++ b/src/SMAPI/Framework/SCore.cs
@@ -120,7 +120,7 @@ namespace StardewModdingAPI.Framework
             this.ModsPath = modsPath;
 
             // init log file
-            this.PurgeLogFiles();
+            this.PurgeNormalLogs();
             string logPath = this.GetLogPath();
 
             // init basics
@@ -1329,8 +1329,8 @@ namespace StardewModdingAPI.Framework
             throw new InvalidOperationException("Could not find an available log path.");
         }
 
-        /// <summary>Delete all log files created by SMAPI.</summary>
-        private void PurgeLogFiles()
+        /// <summary>Delete normal (non-crash) log files created by SMAPI.</summary>
+        private void PurgeNormalLogs()
         {
             DirectoryInfo logsDir = new DirectoryInfo(Constants.LogDir);
             if (!logsDir.Exists)
@@ -1338,16 +1338,22 @@ namespace StardewModdingAPI.Framework
 
             foreach (FileInfo logFile in logsDir.EnumerateFiles())
             {
-                if (logFile.Name.StartsWith(Constants.LogNamePrefix, StringComparison.InvariantCultureIgnoreCase))
+                // skip non-SMAPI file
+                if (!logFile.Name.StartsWith(Constants.LogNamePrefix, StringComparison.InvariantCultureIgnoreCase))
+                    continue;
+
+                // skip crash log
+                if (logFile.FullName == Constants.FatalCrashLog)
+                    continue;
+
+                // delete file
+                try
                 {
-                    try
-                    {
-                        FileUtilities.ForceDelete(logFile);
-                    }
-                    catch (IOException)
-                    {
-                        // ignore file if it's in use
-                    }
+                    FileUtilities.ForceDelete(logFile);
+                }
+                catch (IOException)
+                {
+                    // ignore file if it's in use
                 }
             }
         }
-- 
cgit