diff --git a/src/main_window.cpp b/src/main_window.cpp index 6f49db7..74e94b6 100644 --- 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(); - 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(); - m_subscriptionMonitor = std::make_unique(); + try { + CommonData::m_ddsManager = std::make_unique(); + 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(); + m_subscriptionMonitor = std::make_unique(); + } + 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 index 7a56951..428ae3d 160000 --- a/thirdparty/OpenDDW +++ b/thirdparty/OpenDDW @@ -1 +1 @@ -Subproject commit 7a569515aafab11c0819dc3cc592e5aeba98e4d7 +Subproject commit 428ae3d97008256700e39259602e1849f264d69b