options-watcher queries option before starting thread

src/core/options-watcher.cpp

@@ -30,15 +30,7 @@ options_watcher::~options_watcher()
 
 void options_watcher::register_option( rs2_option id, std::shared_ptr< option > option )
 {
-    registered_option opt = { option, 0.0f };
-    try
-    {
-        opt.last_known_value = option->query();
-    }
-    catch( ... )
-    {
-        // Some options cannot be queried all the time (i.e. streaming only)
-    }
+    registered_option opt = { option, 0.0f }; //Option actual value will be queried in start if needed.
 
     {
         std::lock_guard< std::mutex > lock( _mutex );
@@ -84,6 +76,11 @@ void options_watcher::start()
 {
     if( ! _updater.joinable() ) // If not already started
     {
+        if( _should_query_for_first_time )
+        {
+            update_options();
+            _should_query_for_first_time = false;
+        }
         _updater = std::thread( [this]() { thread_loop(); } );
     }
 }

src/core/options-watcher.h

@@ -50,14 +50,15 @@ class options_watcher
 
     struct registered_option
     {
-        std::shared_ptr< option > sptr = std::shared_ptr< option >( nullptr );
+        std::shared_ptr< option > sptr;
         float last_known_value = 0.0f;
     };
     std::map< rs2_option, registered_option > _options;
     rsutils::signal< const std::map< rs2_option, std::shared_ptr< option > > & > _on_values_changed;
     std::chrono::milliseconds _update_interval;
     std::thread _updater;
     std::mutex _mutex;
+    bool _should_query_for_first_time = true;
 };