Merge pull request #23 from doug1234/TellMeTheError

Added a popup to handle errors thrown by OpenDDW.
OpenDDS · Feb 12, 2024 · 7efba76 · 7efba76
2 parents b441282 + c2aef51
commit 7efba76
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/src/main_window.cpp b/src/main_window.cpp
@@ -65,13 +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();

diff --git a/thirdparty/OpenDDW b/thirdparty/OpenDDW