Merge branch 'hotfix/COT-6_implement_edit_cs_word' into release

IT-Cotato · Oct 6, 2024 · eaf9344 · eaf9344
2 parents ab5b727 + 4524f45
commit eaf9344
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/pages/CS/CSRedirect.tsx b/src/pages/CS/CSRedirect.tsx
@@ -8,20 +8,24 @@ import { useNavigate, useParams } from 'react-router-dom';
 
 const CSRedirect = () => {
   const params = useParams();
-
   const navigate = useNavigate();
+
   const { currentGeneration } = useGeneration();
 
   //
   //
   //
   useEffect(() => {
+    if (!currentGeneration && !params.generationId) {
+      return;
+    }
+
     if (params.generationId !== undefined) {
       navigate(`/cs/${currentGeneration?.generationId}`);
     } else {
       navigate(`/cs/${currentGeneration?.generationId}`);
     }
-  }, []);
+  }, [currentGeneration, params]);
 
   //
   //