Work:

-Don't timeout if fms dir is missing (fail immediately) -Don't set Installed = true on unavailable TDM FMs
FenPhoenix · Oct 27, 2023 · 9d93ac7 · 9d93ac7
1 parent d413b0d
commit 9d93ac7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/AngelLoader/TDM/TDMParser.cs b/AngelLoader/TDM/TDMParser.cs
@@ -45,7 +45,11 @@ internal static List<TDM_LocalFMData> ParseMissionsInfoFile()
                         lines = File_ReadAllLines_List(missionsFile);
                         break;
                     }
-                    catch(FileNotFoundException)
+                    catch (DirectoryNotFoundException)
+                    {
+                        return new List<TDM_LocalFMData>();
+                    }
+                    catch (FileNotFoundException)
                     {
                         return new List<TDM_LocalFMData>();
                     }

diff --git a/AngelLoader/TDM/TDMWatchers.cs b/AngelLoader/TDM/TDMWatchers.cs
@@ -158,7 +158,7 @@ private static void UpdateTDMInstalledFMStatus()
                 // @TDM(Case-sensitivity/UpdateTDMInstalledFMStatus): Case-sensitive compare
                 // Case-sensitive compare of the dir name from currentfm.txt and the dir name from our
                 // list.
-                fm.Installed = fmName != null && fm.TDMInstalledDir == fmName;
+                fm.Installed = fmName != null && !fm.MarkedUnavailable && fm.TDMInstalledDir == fmName;
             }
         }