Adding destruction flag to stop queries as soon as possible

src/core/options-watcher.cpp

@@ -11,17 +11,16 @@ namespace librealsense {
 
 options_watcher::options_watcher( std::chrono::milliseconds update_interval )
     : _update_interval( update_interval )
+    , _destructing( false )
 {
 }
 
 options_watcher::~options_watcher()
 {
+    _destructing = true;
     try
     {
-        {
-            std::lock_guard< std::mutex > lock( _mutex );
-            _options.clear();
-        }
+        _options.clear();
         stop();
     }
     catch( ... )
@@ -71,7 +70,7 @@ bool options_watcher::should_start() const
 
 bool options_watcher::should_stop() const
 {
-    return _on_values_changed.size() == 0 || _options.size() == 0;
+    return _on_values_changed.size() == 0 || _options.size() == 0 || _destructing;
 }
 
 void options_watcher::start()

src/core/options-watcher.h

@@ -59,6 +59,7 @@ class options_watcher
     std::thread _updater;
     std::mutex _mutex;
     std::condition_variable _stopping;
+    std::atomic_bool _destructing;
 };
 
 

src/sensor.h

@@ -196,8 +196,8 @@ namespace librealsense
 
         // Sometimes it is more efficient to prepare for large or repeating operations. Depending on the actual sensor
         // type we might want to change power state or encapsulate small transactions into a large one.
-        virtual void prepare_for_bulk_operation() {};
-        virtual void finished_bulk_operation(){};
+        virtual void prepare_for_bulk_operation() {}
+        virtual void finished_bulk_operation(){}
     };
 
     // A sensor pointer to another "raw sensor", usually UVC/HID