fixed a bug where animated GIFs crashed the game and version bump

legoandmars · May 29, 2021 · 41d4306 · 41d4306
1 parent 08c85bf
commit 41d4306
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/ModelDownloader/HarmonyPatches/Patches/AnimatorControllerPatch.cs b/ModelDownloader/HarmonyPatches/Patches/AnimatorControllerPatch.cs
@@ -13,13 +13,13 @@ internal class AnimatorControllerPatch
     {
         private static void Prefix(AnimationControllerData __instance)
         {
-            if (__instance.sprite.name.StartsWith("ModelDownloaderAnimation"))
+            if (__instance != null && __instance.sprite != null && __instance.activeImages != null && __instance.sprite.name.StartsWith("ModelDownloaderAnimation"))
             {
                 var newImageList = new List<Image>();
-
-                foreach (var activeImage in __instance.activeImages)
+                for (int i = 0; i < __instance.activeImages.Count; i++)
                 {
-                    if (__instance.sprites.Contains(activeImage.sprite)) newImageList.Add(activeImage);
+                    var activeImage = __instance.activeImages[i];
+                    if (activeImage && __instance.sprites.Contains(activeImage.sprite)) newImageList.Add(activeImage);
                 }
                 __instance.activeImages = newImageList;
             }

diff --git a/ModelDownloader/Properties/AssemblyInfo.cs b/ModelDownloader/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0")]
-[assembly: AssemblyFileVersion("1.1.0")]
+[assembly: AssemblyVersion("1.1.1")]
+[assembly: AssemblyFileVersion("1.1.1")]
diff --git a/ModelDownloader/Settings/UI/ModelDetailViewController.cs b/ModelDownloader/Settings/UI/ModelDetailViewController.cs
@@ -123,7 +123,7 @@ internal void Initialize(ModelsaberEntry model, Sprite cover) {
 
             DownloadInteractable = !DownloadUtils.CheckIfModelInstalled(model);
             PreviewInteractible = !DownloadUtils.CheckIfModelInstalled(model) && (model.Type != "platform" && model.Type != "avatar");
-            Plugin.Log.Info(_pluginConfig.AutomaticallyGeneratePreviews.ToString());
+            // Plugin.Log.Info(_pluginConfig.AutomaticallyGeneratePreviews.ToString());
             if (_pluginConfig.AutomaticallyGeneratePreviews && PreviewInteractible) PreviewPressed();
         }
 

diff --git a/ModelDownloader/manifest.json b/ModelDownloader/manifest.json
@@ -3,7 +3,7 @@
   "id": "ModelDownloader",
   "name": "ModelDownloader",
   "author": "Bobbie",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "A PC Beat Saber mod that allows you to download Sabers, Notes, Platforms, and Avatars directly from ModelSaber, all from a convenient window within your game.",
   "gameVersion": "1.15.0",
   "dependsOn": {