Merge pull request #1346 from remotion-dev/dont-throw-error-if-gif-is…

…-aborted
remotion-dev · Sep 27, 2022 · 3039ce3 · 3039ce3 · vercel · Sep 27, 2022
2 parents ad29e24 + d766bee
commit 3039ce3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/packages/gif/src/GifForDevelopment.tsx b/packages/gif/src/GifForDevelopment.tsx
@@ -39,6 +39,7 @@ export const GifForDevelopment = forwardRef<
 
 	useEffect(() => {
 		let done = false;
+		let aborted = false;
 		const {prom, cancel} = parseWithWorker(resolvedSrc);
 		const newHandle = delayRender('Loading <Gif /> with src=' + resolvedSrc);
 
@@ -52,6 +53,10 @@ export const GifForDevelopment = forwardRef<
 				continueRender(id);
 			})
 			.catch((err) => {
+				if (aborted) {
+					return;
+				}
+
 				if (currentOnError.current) {
 					currentOnError.current(err);
 				} else {
@@ -61,6 +66,7 @@ export const GifForDevelopment = forwardRef<
 
 		return () => {
 			if (!done) {
+				aborted = true;
 				cancel();
 			}
 

diff --git a/packages/gif/src/GifForRendering.tsx b/packages/gif/src/GifForRendering.tsx
@@ -39,6 +39,7 @@ export const GifForRendering = forwardRef<HTMLCanvasElement, RemotionGifProps>(
 		useEffect(() => {
 			const controller = new AbortController();
 			let done = false;
+			let aborted = false;
 			const newHandle = delayRender('Loading <Gif /> with src=' + resolvedSrc);
 
 			parseGif({controller, src: resolvedSrc})
@@ -51,6 +52,10 @@ export const GifForRendering = forwardRef<HTMLCanvasElement, RemotionGifProps>(
 					continueRender(id);
 				})
 				.catch((err) => {
+					if (aborted) {
+						return;
+					}
+
 					if (currentOnError.current) {
 						currentOnError.current(err);
 					} else {
@@ -60,6 +65,7 @@ export const GifForRendering = forwardRef<HTMLCanvasElement, RemotionGifProps>(
 
 			return () => {
 				if (!done) {
+					aborted = true;
 					controller.abort();
 				}