From 17918fb7cbb9c6d4b4f18018da0feb21d219cfeb Mon Sep 17 00:00:00 2001
From: founta <dfountain111@gmail.com>
Date: Mon, 23 Mar 2026 19:49:40 -0400
Subject: [PATCH] remove additional reset state storage

---
 wayvr/src/backend/openvr/playspace.rs | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/wayvr/src/backend/openvr/playspace.rs b/wayvr/src/backend/openvr/playspace.rs
index 6680e060..66e1409f 100644
--- a/wayvr/src/backend/openvr/playspace.rs
+++ b/wayvr/src/backend/openvr/playspace.rs
@@ -23,7 +23,6 @@ pub(super) struct PlayspaceMover {
     universe: ETrackingUniverseOrigin,
     drag: Option<MoverData<Vec3A>>,
     rotate: Option<MoverData<Quat>>,
-    reset: Option<usize>,
 }
 
 impl PlayspaceMover {
@@ -32,7 +31,6 @@ impl PlayspaceMover {
             universe: ETrackingUniverseOrigin::TrackingUniverseRawAndUncalibrated,
             drag: None,
             rotate: None,
-            reset: None,
         }
     }
 
@@ -181,20 +179,10 @@ impl PlayspaceMover {
             }
         }
 
-        if self.reset.is_none() {
-            for (i, pointer) in app.input_state.pointers.iter().enumerate() {
-                if pointer.now.space_reset {
-                    self.reset_offset(chaperone_mgr, &app.input_state);
-                    self.reset = Some(i);
-                    log::info!("Space reset");
-                    return;
-                }
-            }
-        } else {
-            let pointer = &app.input_state.pointers[self.reset.unwrap()];
-            if !pointer.now.space_reset {
-                self.reset = None;
-                log::debug!("End space reset");
+        for (_, pointer) in app.input_state.pointers.iter().enumerate() {
+            if pointer.now.space_reset && !pointer.before.space_reset {
+                self.reset_offset(chaperone_mgr, &app.input_state);
+                log::info!("Space reset");
                 return;
             }
         }