From 8c4d8894ecd6e6698aa03e5e39f2f08ae3b1d3d8 Mon Sep 17 00:00:00 2001
From: Jordan Eldredge <jordan@jordaneldredge.com>
Date: Tue, 5 Jan 2021 22:45:47 -0800
Subject: [PATCH] Move code intended to handle bad .ani files to the right
 place

---
 packages/webamp/js/components/Skin.tsx | 10 ++++++++--
 packages/webamp/js/skinParserUtils.ts  |  7 +------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/webamp/js/components/Skin.tsx b/packages/webamp/js/components/Skin.tsx
index fde959fb..1723fb4b 100644
--- a/packages/webamp/js/components/Skin.tsx
+++ b/packages/webamp/js/components/Skin.tsx
@@ -93,10 +93,16 @@ const getCssRules = createSelector(
             case "cur":
               return `${selector} {cursor: url(${cursor.url}), auto}`;
             case "ani": {
-              return convertAniBinaryToCSS(selector, cursor.aniData);
+              try {
+                return convertAniBinaryToCSS(selector, cursor.aniData);
+              } catch (e) {
+                console.error(e);
+                return null;
+              }
             }
           }
-        });
+        })
+        .filter(Boolean);
       cssRules.push(...cursorRules);
     });
 
diff --git a/packages/webamp/js/skinParserUtils.ts b/packages/webamp/js/skinParserUtils.ts
index 6b12f39a..53aa2c34 100644
--- a/packages/webamp/js/skinParserUtils.ts
+++ b/packages/webamp/js/skinParserUtils.ts
@@ -145,12 +145,7 @@ export async function getCursorFromFilename(
   }
   const contents = file.contents as Uint8Array;
   if (arrayStartsWith(contents, RIFF_MAGIC)) {
-    try {
-      return { type: "ani", aniData: contents };
-    } catch (e) {
-      console.error(e);
-      return null;
-    }
+    return { type: "ani", aniData: contents };
   }
 
   return { type: "cur", url: FileUtils.curUrlFromByteArray(contents) };