From 307e3ca1dc36421339ffba8593fd799d76473df1 Mon Sep 17 00:00:00 2001
From: Moses Turner <moses@collabora.com>
Date: Fri, 24 Jun 2022 01:54:25 +0100
Subject: [PATCH] h/old_rgb: Fix regressions

---
 src/xrt/tracking/hand/old_rgb/rgb_sync.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/xrt/tracking/hand/old_rgb/rgb_sync.cpp b/src/xrt/tracking/hand/old_rgb/rgb_sync.cpp
index e4812fbae..0deb0078d 100644
--- a/src/xrt/tracking/hand/old_rgb/rgb_sync.cpp
+++ b/src/xrt/tracking/hand/old_rgb/rgb_sync.cpp
@@ -737,6 +737,8 @@ htExitFrame(struct HandTracking *htd,
 {
 
 	os_mutex_lock(&htd->openxr_hand_data_mediator);
+	*out_timestamp_ns = timestamp;
+
 	if (err) {
 		out_left->is_active = false;
 		out_right->is_active = false;
@@ -745,7 +747,6 @@ htExitFrame(struct HandTracking *htd,
 		*out_right = final_hands_ordered_by_handedness[1];
 
 
-		*out_timestamp_ns = timestamp;
 		HT_DEBUG(htd, "Adding ts %zu", htd->hands_for_openxr_timestamp);
 	}
 	os_mutex_unlock(&htd->openxr_hand_data_mediator);
@@ -1198,6 +1199,8 @@ HandTracking::cCallbackDestroy(t_hand_tracking_sync *ht_sync)
 {
 	auto ht_ptr = &HandTracking::fromC(ht_sync);
 
+	u_sink_debug_destroy(&ht_ptr->debug_sink);
+
 	delete ht_ptr->views[0].htm;
 	delete ht_ptr->views[1].htm;
 	delete ht_ptr;
@@ -1226,6 +1229,7 @@ t_hand_tracking_sync_old_rgb_create(struct t_stereo_camera_calibration *calib)
 	 * Get configuration
 	 */
 
+	u_sink_debug_init(&htd->debug_sink);
 	assert(calib != NULL);
 	getCalibration(htd, calib);
 	// Set defaults - most people won't have a config json and it won't get past here.