From 25ad20bc185e04807af535ebed6622ea9cc9edf2 Mon Sep 17 00:00:00 2001 From: Eran Date: Fri, 24 Nov 2023 10:13:54 +0200 Subject: [PATCH] fixup! tools --sw-only overrides 'dds' --- tools/enumerate-devices/rs-enumerate-devices.cpp | 2 +- tools/realsense-viewer/realsense-viewer.cpp | 4 +++- tools/terminal/rs-terminal.cpp | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/enumerate-devices/rs-enumerate-devices.cpp b/tools/enumerate-devices/rs-enumerate-devices.cpp index 4d78751f827..f9adb2ce4f3 100644 --- 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 index c0f1c59756c..29ed3c05a72 100644 --- 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 index 3525e6d4dd2..4eb62800b8f 100644 --- 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() )