Merge pull request #8561 from krazycoder2k/patch-7

T265 fix for race condition during pipeline stop.
IntelRealSense · Mar 24, 2021 · 02e51de · 02e51de
2 parents f137e18 + c67522b
commit 02e51de
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/tm2/tm-device.cpp b/src/tm2/tm-device.cpp
@@ -1328,8 +1328,8 @@ namespace librealsense
     void tm2_sensor::stop_interrupt()
     {
         if (_interrupt_request) {
+            _interrupt_callback->cancel();
             if (_device->cancel_request(_interrupt_request)) {
-                _interrupt_callback->cancel();
                 _interrupt_request.reset();
             }
         }
@@ -1389,8 +1389,8 @@ namespace librealsense
     void tm2_sensor::stop_stream()
     {
         if (_stream_request) {
+            _stream_callback->cancel();
             if (_device->cancel_request(_stream_request)) {
-                _stream_callback->cancel();
                 _stream_request.reset();
             }
         }