From e50f1d01be78f1bd53c15c537e32f20174b55869 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 19 Jun 2020 23:09:47 +1000
Subject: [PATCH] Fix scene delete (#621)

---
 .../src/components/Scenes/SceneDetails/Scene.tsx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
index f0c7c5ced..c35985fbb 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
@@ -31,12 +31,6 @@ export const Scene: React.FC = () => {
   const [generateScreenshot] = useSceneGenerateScreenshot();
   const [timestamp, setTimestamp] = useState<number>(getInitialTimestamp());
 
-  const [isDeleteAlertOpen, setIsDeleteAlertOpen] = useState<boolean>(false);
-  const [deleteFile, setDeleteFile] = useState<boolean>(false);
-  const [deleteGenerated, setDeleteGenerated] = useState<boolean>(true);
-  const [deleteLoading, setDeleteLoading] = useState(false);
-  const [deleteScene] = useSceneDestroy(getSceneDeleteInput());
-
   const [scene, setScene] = useState<GQL.SceneDataFragment | undefined>();
   const { data, error, loading } = useFindScene(id);
   const [oLoading, setOLoading] = useState(false);
@@ -44,6 +38,12 @@ export const Scene: React.FC = () => {
   const [decrementO] = useSceneDecrementO(scene?.id ?? "0");
   const [resetO] = useSceneResetO(scene?.id ?? "0");
 
+  const [isDeleteAlertOpen, setIsDeleteAlertOpen] = useState<boolean>(false);
+  const [deleteFile, setDeleteFile] = useState<boolean>(false);
+  const [deleteGenerated, setDeleteGenerated] = useState<boolean>(true);
+  const [deleteLoading, setDeleteLoading] = useState(false);
+  const [deleteScene] = useSceneDestroy(getSceneDeleteInput());
+
   const queryParams = queryString.parse(location.search);
   const autoplay = queryParams?.autoplay === "true";
 
@@ -122,7 +122,7 @@ export const Scene: React.FC = () => {
 
   function getSceneDeleteInput(): GQL.SceneDestroyInput {
     return {
-      id: scene ? scene.id : "0",
+      id: scene?.id ?? "0",
       delete_file: deleteFile,
       delete_generated: deleteGenerated,
     };
@@ -286,7 +286,7 @@ export const Scene: React.FC = () => {
             <SceneEditPanel
               scene={scene}
               onUpdate={(newScene) => setScene(newScene)}
-              onDelete={onDelete}
+              onDelete={() => setIsDeleteAlertOpen(true)}
             />
           </Tab.Pane>
         </Tab.Content>