Merge pull request #3372 from PenghaiZhang/bugfix/do-not-update-state…

…-when-search-result-unmounted bugfix: do not update SearchResult state when it is unmounted
openequella · Sep 7, 2021 · 78ff3d4 · 78ff3d4
2 parents 3d4b567 + b740e31
commit 78ff3d4
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/react-front-end/tsrc/search/components/SearchResult.tsx b/react-front-end/tsrc/search/components/SearchResult.tsx
@@ -190,6 +190,7 @@ export default function SearchResult({
     setDrmCheckOnSuccessHandler(() => onSuccess);
 
   useEffect(() => {
+    let mounted = true;
     (async () => {
       // If there is nothing requiring DRM permission check then return undefined.
       const dialog = drmCheckOnSuccessHandler
@@ -203,8 +204,14 @@ export default function SearchResult({
           )
         : undefined;
 
-      setDrmDialog(dialog);
+      if (mounted) {
+        setDrmDialog(dialog);
+      }
     })();
+
+    return () => {
+      mounted = false;
+    };
   }, [drmCheckOnSuccessHandler, uuid, version, drmStatus]);
 
   const handleSelectResource = (