From 6c1a58c0d440b9b26b95ee22a0cdc6a8d1975507 Mon Sep 17 00:00:00 2001
From: Douglas Ayers <douglas.d.ayers.civ@us.navy.mil>
Date: Fri, 8 Dec 2023 07:15:29 -0500
Subject: [PATCH 1/2] Added a popup to handle errors thrown by OpenDDW.

---
 src/main_window.cpp | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main_window.cpp b/src/main_window.cpp
index db5f7cb..331d245 100644
--- a/src/main_window.cpp
+++ b/src/main_window.cpp
@@ -65,12 +65,18 @@ DDSMonitorMainWindow::DDSMonitorMainWindow() :
         activateWindow();
 
         // Join the DDS domain
-        CommonData::m_ddsManager = std::make_unique<DDSManager>();
-        m_participantPage = new ParticipantPage(mainTabWidget);
-        CommonData::m_ddsManager->joinDomain(domainID, "", [page = m_participantPage](const ParticipantInfo& info) {page->addParticipant(info); }, 
-            [page = m_participantPage](const ParticipantInfo& info) {page->removeParticipant(info); });
-        m_publicationMonitor = std::make_unique<PublicationMonitor>();
-        m_subscriptionMonitor = std::make_unique<SubscriptionMonitor>();
+        try {
+            CommonData::m_ddsManager = std::make_unique<DDSManager>();
+            m_participantPage = new ParticipantPage(mainTabWidget);
+            CommonData::m_ddsManager->joinDomain(domainID, "", [page = m_participantPage](const ParticipantInfo& info) {page->addParticipant(info); },
+                [page = m_participantPage](const ParticipantInfo& info) {page->removeParticipant(info); });
+            m_publicationMonitor = std::make_unique<PublicationMonitor>();
+            m_subscriptionMonitor = std::make_unique<SubscriptionMonitor>();
+        }
+        catch (std::runtime_error &e) {
+            QMessageBox::information(nullptr, "Error Starting Open DDS", e.what());
+            exit(1);
+        }
 
         // Send DDS configuration to the log screen
         reportConfig();

From c2aef51d2a865b3033015cf769e345e08aa16a17 Mon Sep 17 00:00:00 2001
From: Douglas Ayers <douglas.d.ayers.civ@us.navy.mil>
Date: Thu, 8 Feb 2024 10:51:44 -0500
Subject: [PATCH 2/2] Update to newest openddw

---
 thirdparty/OpenDDW | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/thirdparty/OpenDDW b/thirdparty/OpenDDW
index 7a56951..428ae3d 160000
--- a/thirdparty/OpenDDW
+++ b/thirdparty/OpenDDW
@@ -1 +1 @@
-Subproject commit 7a569515aafab11c0819dc3cc592e5aeba98e4d7
+Subproject commit 428ae3d97008256700e39259602e1849f264d69b