Skip to content

Commit 887d567

Browse files
committedAug 25, 2024
Merge pull request #95959 from dsnopek/openxr-api-hand-tracker-crash
Fix crash when calling `OpenXRAPI::get_hand_tracker()` and hand-tracking is disabled
2 parents 844ac90 + 11dd1f5 commit 887d567

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed
 

‎modules/openxr/openxr_api.cpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -1737,8 +1737,12 @@ void OpenXRAPI::cleanup_extension_wrappers() {
17371737

17381738
XrHandTrackerEXT OpenXRAPI::get_hand_tracker(int p_hand_index) {
17391739
ERR_FAIL_INDEX_V(p_hand_index, OpenXRHandTrackingExtension::HandTrackedHands::OPENXR_MAX_TRACKED_HANDS, XR_NULL_HANDLE);
1740+
1741+
OpenXRHandTrackingExtension *hand_tracking = OpenXRHandTrackingExtension::get_singleton();
1742+
ERR_FAIL_NULL_V(hand_tracking, XR_NULL_HANDLE);
1743+
17401744
OpenXRHandTrackingExtension::HandTrackedHands hand = static_cast<OpenXRHandTrackingExtension::HandTrackedHands>(p_hand_index);
1741-
return OpenXRHandTrackingExtension::get_singleton()->get_hand_tracker(hand)->hand_tracker;
1745+
return hand_tracking->get_hand_tracker(hand)->hand_tracker;
17421746
}
17431747

17441748
Size2 OpenXRAPI::get_recommended_target_size() {

0 commit comments

Comments
 (0)