From 1713308a0f510ffff6924b597cdf97f6bbd3daad Mon Sep 17 00:00:00 2001
From: Quicksticks-oss <chongobongotoday@gmail.com>
Date: Tue, 23 Apr 2024 22:44:48 -0400
Subject: [PATCH 1/2] removed some merge duplicate items.

---
 app/pages/PageEnigma/js/editor.ts | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/app/pages/PageEnigma/js/editor.ts b/app/pages/PageEnigma/js/editor.ts
index 632130f7f5..e6251bb50f 100644
--- a/app/pages/PageEnigma/js/editor.ts
+++ b/app/pages/PageEnigma/js/editor.ts
@@ -703,9 +703,6 @@ class Editor {
     if (obj?.name === "::CAM::") {
       return;
     }
-    if (obj?.name === "::CAM::") {
-      return;
-    }
     if (obj) {
       this.activeScene.scene.remove(obj);
     }
@@ -864,10 +861,6 @@ class Editor {
       if (changeView) {
         this.switchCameraView();
       }
-    } else if (
-      this.last_scrub === this.timeline.scrubber_frame_position &&
-      this.getselectedSum() !== this.last_selected_sum
-    ) {
     } else if (
       this.last_scrub === this.timeline.scrubber_frame_position &&
       this.getselectedSum() !== this.last_selected_sum
@@ -943,10 +936,6 @@ class Editor {
         "|" +
         startTime * 1000 +
         "[a1];[0:a][a1]amix=inputs=2[a]",
-        startTime * 1000 +
-        "|" +
-        startTime * 1000 +
-        "[a1];[0:a][a1]amix=inputs=2[a]",
       "-map",
       "[a]",
       `${itteration}final_tmp.wav`,

From ce025f329e51c1d56f92750f7cde513c52707ab6 Mon Sep 17 00:00:00 2001
From: Quicksticks-oss <chongobongotoday@gmail.com>
Date: Tue, 23 Apr 2024 22:50:26 -0400
Subject: [PATCH 2/2] makes sure style preview is not null.

---
 app/pages/PageEnigma/js/editor.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/pages/PageEnigma/js/editor.ts b/app/pages/PageEnigma/js/editor.ts
index e6251bb50f..efd53d1459 100644
--- a/app/pages/PageEnigma/js/editor.ts
+++ b/app/pages/PageEnigma/js/editor.ts
@@ -1074,8 +1074,10 @@ class Editor {
       const stylePreview: HTMLVideoElement | null = document.getElementById(
         "styled-preview",
       ) as HTMLVideoElement;
-      this.rawRenderer.setSize(stylePreview.width, stylePreview.height);
-      this.render_camera.aspect = stylePreview.width / stylePreview.height;
+      if(stylePreview != null){
+        this.rawRenderer.setSize(stylePreview.width, stylePreview.height);
+        this.render_camera.aspect = stylePreview.width / stylePreview.height;
+      }
     }
   }