From e191d4919b9d7566e035b65c4c8a2a38f7776812 Mon Sep 17 00:00:00 2001
From: Ellpeck <me@ellpeck.de>
Date: Mon, 4 Dec 2023 10:20:29 +0100
Subject: [PATCH] Fixed InputHandler touch states being initialized incorrectly
 when touch handling is disabled Closes #10

---
 CHANGELOG.md               | 1 +
 MLEM/Input/InputHandler.cs | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9c170f..f772185 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@ Improvements
 
 Fixes
 - Fixed TextInput not working correctly when using surrogate pairs
+- Fixed InputHandler touch states being initialized incorrectly when touch handling is disabled
 
 ### MLEM.Ui
 Additions
diff --git a/MLEM/Input/InputHandler.cs b/MLEM/Input/InputHandler.cs
index 5729513..c17ce25 100644
--- a/MLEM/Input/InputHandler.cs
+++ b/MLEM/Input/InputHandler.cs
@@ -121,11 +121,11 @@ namespace MLEM.Input {
         /// <summary>
         /// Contains the <see cref="LastTouchState"/>, but with the <see cref="GraphicsDevice.Viewport"/> taken into account.
         /// </summary>
-        public IList<TouchLocation> LastViewportTouchState { get; private set; }
+        public IList<TouchLocation> LastViewportTouchState { get; private set; } = new List<TouchLocation>();
         /// <summary>
         /// Contains the <see cref="TouchState"/>, but with the <see cref="GraphicsDevice.Viewport"/> taken into account.
         /// </summary>
-        public IList<TouchLocation> ViewportTouchState { get; private set; }
+        public IList<TouchLocation> ViewportTouchState { get; private set; } = new List<TouchLocation>();
         /// <summary>
         /// Contains the amount of gamepads that are currently connected. Note that this value will be set to 0 if <see cref="HandleGamepads"/> is false.
         /// This field is automatically updated in <see cref="Update()"/>.
@@ -342,6 +342,7 @@ namespace MLEM.Input {
                 }
             } else {
                 this.TouchState = new TouchCollection(InputHandler.EmptyTouchLocations);
+                this.ViewportTouchState = this.TouchState;
                 this.gestures.Clear();
             }