Skip to content

Commit 7e3fd69

Browse files
committed
Fix crash on runtimes that don't support palm pose;
Also remove pinch/poke bindings individually so it's a little less brittle.
1 parent 34265f5 commit 7e3fd69

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/modules/headset/headset_openxr.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1601,8 +1601,8 @@ static bool openxr_init(HeadsetConfig* config) {
16011601
for (uint32_t i = 0; i < MAX_PROFILES; i++) {
16021602
for (uint32_t j = 0; j < bindingCount[i]; j++) {
16031603
if (bindings[i][j].action == ACTION_PINCH_POSE || bindings[i][j].action == ACTION_POKE_POSE) {
1604-
REMOVE_BINDINGS(bindings[i], bindingCount[i], j, 4);
1605-
bindingCount[i] -= 4;
1604+
REMOVE_BINDINGS(bindings[i], bindingCount[i], j, 2);
1605+
bindingCount[i] -= 2;
16061606
break;
16071607
}
16081608
}
@@ -1611,7 +1611,7 @@ static bool openxr_init(HeadsetConfig* config) {
16111611

16121612
if (!state.extensions.palmPose) {
16131613
for (uint32_t i = 0; i < MAX_PROFILES; i++) {
1614-
for (uint32_t j = 0; bindings[i][j].path; j++) {
1614+
for (uint32_t j = 0; j < bindingCount[i]; j++) {
16151615
if (bindings[i][j].action == ACTION_PALM_POSE) {
16161616
REMOVE_BINDINGS(bindings[i], bindingCount[i], j, 2);
16171617
bindingCount[i] -= 2;

0 commit comments

Comments
 (0)