From 00818881de035daa5ab55b3a09a46315c2394b46 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@collabora.com>
Date: Sat, 30 May 2020 19:59:51 +0100
Subject: [PATCH] st/oxr: Use correct path for gamepad

---
 doc/changes/state_trackers/mr.359.9.md    | 2 ++
 src/xrt/state_trackers/oxr/oxr_instance.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 doc/changes/state_trackers/mr.359.9.md

diff --git a/doc/changes/state_trackers/mr.359.9.md b/doc/changes/state_trackers/mr.359.9.md
new file mode 100644
index 000000000..711234230
--- /dev/null
+++ b/doc/changes/state_trackers/mr.359.9.md
@@ -0,0 +1,2 @@
+OpenXR: Use the correct XrPath for `/user/gamepad` while it sits in the users
+hand itsn't `/user/hand/gamepad` as previously believed.
diff --git a/src/xrt/state_trackers/oxr/oxr_instance.c b/src/xrt/state_trackers/oxr/oxr_instance.c
index 21b749248..3b5c3337a 100644
--- a/src/xrt/state_trackers/oxr/oxr_instance.c
+++ b/src/xrt/state_trackers/oxr/oxr_instance.c
@@ -135,7 +135,7 @@ oxr_instance_create(struct oxr_logger *log,
 	cache_path(log, inst, "/user/hand/head", &inst->path_cache.head);
 	cache_path(log, inst, "/user/hand/left", &inst->path_cache.left);
 	cache_path(log, inst, "/user/hand/right", &inst->path_cache.right);
-	cache_path(log, inst, "/user/hand/gamepad", &inst->path_cache.gamepad);
+	cache_path(log, inst, "/user/gamepad", &inst->path_cache.gamepad);
 	cache_path(log, inst, "/interaction_profiles/khr/simple_controller", &inst->path_cache.khr_simple_controller);
 	cache_path(log, inst, "/interaction_profiles/google/daydream_controller", &inst->path_cache.google_daydream_controller);
 	cache_path(log, inst, "/interaction_profiles/htc/vive_controller", &inst->path_cache.htc_vive_controller);