fixup! tools --sw-only overrides 'dds'

maloel · Nov 24, 2023 · 25ad20b · 25ad20b
1 parent f8e9402
commit 25ad20b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/tools/enumerate-devices/rs-enumerate-devices.cpp b/tools/enumerate-devices/rs-enumerate-devices.cpp
@@ -361,7 +361,7 @@ int main(int argc, char** argv) try
     if( domain_arg.isSet() )
         dds["domain"] = domain_arg.getValue();
     if( only_sw_arg.isSet() )
-        dds["enabled"] = true;  // override global dds:false or dds/enabled:false, if any
+        dds["enabled"];  // null: remove global dds:false or dds/enabled:false, if any
     settings["dds"] = std::move( dds );
 #endif
     settings["format-conversion"] = format_arg.getValue();

diff --git a/tools/realsense-viewer/realsense-viewer.cpp b/tools/realsense-viewer/realsense-viewer.cpp
@@ -335,7 +335,9 @@ int main(int argc, const char** argv) try
     nlohmann::json settings = nlohmann::json::object();
     if( only_sw_arg.getValue() )
     {
-        settings["dds"]["enabled"] = true;  // override global dds:false or dds/enabled:false, if any
+#if defined( BUILD_WITH_DDS )
+        settings["dds"]["enabled"];  // null: remove global dds:false or dds/enabled:false, if any
+#endif
         settings["device-mask"] = RS2_PRODUCT_LINE_SW_ONLY | RS2_PRODUCT_LINE_ANY;
     }
 

diff --git a/tools/terminal/rs-terminal.cpp b/tools/terminal/rs-terminal.cpp
@@ -203,7 +203,7 @@ int main(int argc, char** argv)
     if( domain_arg.isSet() )
         dds["domain"] = domain_arg.getValue();
     if( only_sw_arg.isSet() )
-        dds["enabled"] = true;  // override global dds:false or dds/enabled:false, if any
+        dds["enabled"];  // null: remove global dds:false or dds/enabled:false, if any
     settings["dds"] = std::move( dds );
 #endif
     if( only_sw_arg.getValue() )