From cf9cde9f59d9815e86db9935cee073f06c09ae97 Mon Sep 17 00:00:00 2001
From: Eran <librealsense.eran@gmail.com>
Date: Thu, 11 Jan 2024 14:22:04 +0200
Subject: [PATCH] fix non-DDS settings initialization in rs-terminal and
 -enumerate-devices

---
 tools/enumerate-devices/rs-enumerate-devices.cpp | 14 ++++++++------
 tools/terminal/rs-terminal.cpp                   | 15 +++++++++------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/tools/enumerate-devices/rs-enumerate-devices.cpp b/tools/enumerate-devices/rs-enumerate-devices.cpp
index 1daf7f55a6..4b44338386 100644
--- a/tools/enumerate-devices/rs-enumerate-devices.cpp
+++ b/tools/enumerate-devices/rs-enumerate-devices.cpp
@@ -355,14 +355,16 @@ int main(int argc, char** argv) try
     }
 
     // Obtain a list of devices currently present on the system
-    json settings;
+    json settings = json::object();
 #ifdef BUILD_WITH_DDS
-    json dds;
-    if( domain_arg.isSet() )
-        dds["domain"] = domain_arg.getValue();
-    if( only_sw_arg.isSet() )
+    if( domain_arg.isSet() || only_sw_arg.isSet() )
+    {
+        json dds = json::object();
+        if( domain_arg.isSet() )
+            dds["domain"] = domain_arg.getValue();
         dds["enabled"];  // null: remove global dds:false or dds/enabled:false, if any
-    settings["dds"] = std::move( dds );
+        settings["dds"] = std::move( dds );
+    }
 #endif
     settings["format-conversion"] = format_arg.getValue();
     context ctx( settings.dump() );
diff --git a/tools/terminal/rs-terminal.cpp b/tools/terminal/rs-terminal.cpp
index 800318194a..af281a5059 100644
--- a/tools/terminal/rs-terminal.cpp
+++ b/tools/terminal/rs-terminal.cpp
@@ -18,6 +18,7 @@
 
 using namespace std;
 using namespace TCLAP;
+using rsutils::json;
 
 
 vector<uint8_t> build_raw_command_data(const command& command, const vector<string>& params)
@@ -197,14 +198,16 @@ int main(int argc, char** argv)
     // parse command.xml
     rs2::log_to_file(RS2_LOG_SEVERITY_WARN, "librealsense.log");
 
-    rsutils::json settings;
+    json settings = json::object();
 #ifdef BUILD_WITH_DDS
-    rsutils::json dds;
-    if( domain_arg.isSet() )
-        dds["domain"] = domain_arg.getValue();
-    if( only_sw_arg.isSet() )
+    if( domain_arg.isSet() || only_sw_arg.isSet() )
+    {
+        json dds = json::object();
+        if( domain_arg.isSet() )
+            dds["domain"] = domain_arg.getValue();
         dds["enabled"];  // null: remove global dds:false or dds/enabled:false, if any
-    settings["dds"] = std::move( dds );
+        settings["dds"] = std::move( dds );
+    }
 #endif
     if( only_sw_arg.getValue() )
         settings["device-mask"] = RS2_PRODUCT_LINE_SW_ONLY | RS2_PRODUCT_LINE_ANY;