Fix failing shutdown with already shutdown monkeys

MonkeyModdingTroop · Nov 22, 2024 · 76bb700 · 76bb700
1 parent 4ab3717
commit 76bb700
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/MonkeyLoader/Meta/IShutdown.cs b/MonkeyLoader/Meta/IShutdown.cs
@@ -23,14 +23,17 @@ public static class ShutdownEnumerableExtensions
         /// Calls the <see cref="IShutdown.Shutdown"/> method on all elements of the collection,
         /// aggregating their success state as an 'all'.
         /// </summary>
+        /// <remarks>
+        /// Already <see cref="IShutdown.ShutdownRan">shut down</see> elements are ignored.
+        /// </remarks>
         /// <param name="shutdowns">The <see cref="IShutdown"/> instances to process.</param>
         /// <param name="applicationExiting">Whether the shutdown was caused by the application exiting.</param>
         /// <returns><c>true</c> if all instances successfully shut down, <c>false</c> otherwise.</returns>
         public static bool ShutdownAll(this IEnumerable<IShutdown> shutdowns, bool applicationExiting)
         {
             var success = true;
 
-            foreach (var shutdown in shutdowns)
+            foreach (var shutdown in shutdowns.Where(shutdown => !shutdown.ShutdownRan))
                 success &= shutdown.Shutdown(applicationExiting);
 
             return success;

diff --git a/MonkeyLoader/Patching/MonkeyBase.cs b/MonkeyLoader/Patching/MonkeyBase.cs
@@ -209,9 +209,10 @@ public bool Shutdown(bool applicationExiting)
 
         /// <inheritdoc/>
         /// <remarks>
-        /// <i>Format:</i> <c>{<see cref="Mod">Mod</see>.<see cref="Mod.Title">Title</see>}/{<see cref="Name">Name</see>}</c>
+        /// <i>Format:</i> <c>{<see cref="Mod">Mod</see>.<see cref="Mod.Title">Title</see>}/{<see cref="Name">Name</see>}
+        /// ({(<see cref="Ran">Ran</see> ? (<see cref="ShutdownRan">ShutdownRan</see> ? "Ended" : (<see cref="Enabled">Enabled</see> ? "Active" : "Inactive")) : "Pending")})</c>
         /// </remarks>
-        public override string ToString() => $"{Mod.Title}/{Name}";
+        public override string ToString() => $"{Mod.Title}/{Name} ({(Ran ? (ShutdownRan ? "Ended" : (Enabled ? "Active" : "Inactive")) : "Pending")})";
 
         internal static TMonkey GetInstance<TMonkey>(Type type, Mod mod) where TMonkey : IMonkey
         {