Merge pull request #95959 from dsnopek/openxr-api-hand-tracker-crash

Fix crash when calling `OpenXRAPI::get_hand_tracker()` and hand-tracking is disabled
godotengine · Aug 25, 2024 · 887d567 · 887d567
2 parents 844ac90 + 11dd1f5
commit 887d567
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/modules/openxr/openxr_api.cpp b/modules/openxr/openxr_api.cpp
@@ -1737,8 +1737,12 @@ void OpenXRAPI::cleanup_extension_wrappers() {
 
 XrHandTrackerEXT OpenXRAPI::get_hand_tracker(int p_hand_index) {
 	ERR_FAIL_INDEX_V(p_hand_index, OpenXRHandTrackingExtension::HandTrackedHands::OPENXR_MAX_TRACKED_HANDS, XR_NULL_HANDLE);
+
+	OpenXRHandTrackingExtension *hand_tracking = OpenXRHandTrackingExtension::get_singleton();
+	ERR_FAIL_NULL_V(hand_tracking, XR_NULL_HANDLE);
+
 	OpenXRHandTrackingExtension::HandTrackedHands hand = static_cast<OpenXRHandTrackingExtension::HandTrackedHands>(p_hand_index);
-	return OpenXRHandTrackingExtension::get_singleton()->get_hand_tracker(hand)->hand_tracker;
+	return hand_tracking->get_hand_tracker(hand)->hand_tracker;
 }
 
 Size2 OpenXRAPI::get_recommended_target_size() {