From c527fed70c080e6442e79908689be0cefe9f6a42 Mon Sep 17 00:00:00 2001
From: Abnormal <86753001+AbnormalPoof@users.noreply.github.com>
Date: Tue, 22 Jul 2025 08:24:23 -0500
Subject: [PATCH] conflict stuffs lol

---
 source/funkin/ui/options/OptionsState.hx | 12 ------------
 source/funkin/util/WindowUtil.hx         |  1 +
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/source/funkin/ui/options/OptionsState.hx b/source/funkin/ui/options/OptionsState.hx
index cc57ec1db..528a3b7b8 100644
--- a/source/funkin/ui/options/OptionsState.hx
+++ b/source/funkin/ui/options/OptionsState.hx
@@ -161,18 +161,6 @@ class OptionsMenu extends Page<OptionsMenuPageName>
 
   final CAMERA_MARGIN:Int = 150;
 
-  #if FEATURE_TOUCH_CONTROLS
-  var backButton:FunkinBackButton;
-  var goingBack:Bool = false;
-  #end
-
-  /**
-   * Camera focus point
-   */
-  var camFocusPoint:FlxObject;
-
-  final CAMERA_MARGIN:Int = 150;
-
   public function new(saveDataMenu:SaveDataMenu)
   {
     super();
diff --git a/source/funkin/util/WindowUtil.hx b/source/funkin/util/WindowUtil.hx
index b7b60d040..2ee34ee80 100644
--- a/source/funkin/util/WindowUtil.hx
+++ b/source/funkin/util/WindowUtil.hx
@@ -144,6 +144,7 @@ class WindowUtil
       }
     });
     #end
+    _initializedWindowEvents = true;
   }
 
   /**