fixed automatic route download, looks like it was hanging sometimes

Author: sweiland-openrails

Source/Menu/ContentForm.cs

@@ -52,6 +52,8 @@ public partial class ContentForm : Form
         //attribute used to refresh UI
         private readonly SynchronizationContext AutoInstallSynchronizationContext;
 
+        public bool AutoInstallDoingTheSumOfTheFileBytes = false;
+
         private readonly string ManualInstallBrouwseDir;
 
         private bool In_dataGridViewManualInstall_SelectionChanged = false;
@@ -952,15 +954,17 @@ private void deleteRoute(string directoryInstalledIn)
         {
             Thread deleteThread = new Thread(() =>
             {
-                ContentRouteSettings.directoryDelete(directoryInstalledIn);
+                ContentRouteSettings.directoryDelete(directoryInstalledIn, ref AutoInstallDoingTheSumOfTheFileBytes);
             });
             // start delete in thread to be able to show the progress in the main thread
             deleteThread.Start();
 
             while (deleteThread.IsAlive)
             {
-                Stopwatch sw = Stopwatch.StartNew();
+                // this will stop the delete until the sum is done
+                AutoInstallDoingTheSumOfTheFileBytes = true;
 
+                Stopwatch sw = Stopwatch.StartNew();
                 TotalBytes = 0;
                 if (sumMB(directoryInstalledIn))
                 {
@@ -970,6 +974,9 @@ private void deleteRoute(string directoryInstalledIn)
                             string.Format("Left: {0} kB", (string)o);
                     }), (TotalBytes / 1024).ToString("N0"));
                 }
+
+                AutoInstallDoingTheSumOfTheFileBytes = false;
+
                 while (deleteThread.IsAlive && (sw.ElapsedMilliseconds <= 1000)) { }
             }
         }

Source/ORTS.Settings/ContentRouteSettings.cs

@@ -196,7 +196,8 @@ public void LoadContent()
                         }
                     }
 
-                    directoryDelete(definedContentJsonDirectoryName);
+                    bool doingTheSumOfTheFileBytes = false;
+                    directoryDelete(definedContentJsonDirectoryName, ref doingTheSumOfTheFileBytes);
                 }
                 catch (Exception error)
                 {
@@ -250,29 +251,37 @@ private string convertResultToString(JToken result, string fieldName)
             }
         }
 
-        public static void directoryDelete(string directoryName)
+        public static void directoryDelete(string directoryName, ref bool doingTheSumOfTheFileBytes)
         {
             if (Directory.Exists(directoryName))
             {
                 // remove the read only flags,
                 // otherwise the Directory.delete does not work in case read only files exists
-                directoryRemoveReadOnlyFlags(directoryName);
+                directoryRemoveReadOnlyFlagsAndDeleteFile(directoryName, ref doingTheSumOfTheFileBytes);
                 Directory.Delete(directoryName, true);
             }
         }
 
-        private static void directoryRemoveReadOnlyFlags(string directoryName)
+        private static void directoryRemoveReadOnlyFlagsAndDeleteFile(string directoryName, ref bool doingTheSumOfTheFileBytes)
         {
             foreach (string filename in Directory.GetFiles(directoryName))
             {
+                while (doingTheSumOfTheFileBytes)
+                {
+                    // stop deleteing file while summing in progress,
+                    // sum is for feedback to the user
+                    System.Threading.Thread.Sleep(10); 
+                }
+
                 _ = new FileInfo(filename)
                 {
                     IsReadOnly = false
                 };
+                File.Delete(filename);
             }
             foreach (string subDirectoryName in Directory.GetDirectories(directoryName))
             {
-                directoryRemoveReadOnlyFlags(subDirectoryName);
+                directoryRemoveReadOnlyFlagsAndDeleteFile(subDirectoryName, ref doingTheSumOfTheFileBytes);
             }
         }
     }