Disable the connection and connection type combo boxes when connection

is active
till213 · May 22, 2024 · b0bddbe · b0bddbe
1 parent 894f53d
commit b0bddbe
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -39,6 +39,7 @@
 
 ## Improvements
 - Seeking backward and forward via flight simulator keyboard shortcuts (CTRL+, respectively CTRL+.) now repeats the action while keeping the shortcut combination pressed
+- Application settings: the flight simulator connection plugin and connection type (pipe, IPv4, IPv6) combo boxes are disabled while the connection is active (replay or recording in progress)
 
 ### Bug Fixes
 - Fix the example [Flight-Analysis.sql](doc/SQL/Flight-Analysis.sql) script (documentation) [[Issue #150](https://github.com/till213/SkyDolly/issues/150)]

diff --git a/src/PluginManager/src/SkyConnectManager.cpp b/src/PluginManager/src/SkyConnectManager.cpp
@@ -277,7 +277,7 @@ bool SkyConnectManager::isInReplayState() const noexcept
 bool SkyConnectManager::isActive() const noexcept
 {
     std::optional<std::reference_wrapper<SkyConnectIntf>> skyConnect = getCurrentSkyConnect();
-    return skyConnect ? skyConnect->get().isInRecordingState() || skyConnect->get().isInReplayState(): false;
+    return skyConnect ? skyConnect->get().isActive() : false;
 }
 
 void SkyConnectManager::stop() noexcept

diff --git a/src/Plugins/Connect/MSFSSimConnectPlugin/src/MSFSSimConnectOptionWidget.cpp b/src/Plugins/Connect/MSFSSimConnectPlugin/src/MSFSSimConnectOptionWidget.cpp
@@ -35,6 +35,7 @@
 #endif
 
 #include <PluginManager/Connect/ConnectPluginBaseSettings.h>
+#include <PluginManager/SkyConnectManager.h>
 #include "MSFSSimConnectSettings.h"
 #include "MSFSSimConnectOptionWidget.h"
 #include "ui_MSFSSimConnectOptionWidget.h"
@@ -91,12 +92,19 @@ void MSFSSimConnectOptionWidget::accept() noexcept
 
 void MSFSSimConnectOptionWidget::frenchConnection() noexcept
 {
+    const auto &skyConnectManager = SkyConnectManager::getInstance();
+    // TODO FIXME: The option widget "survives" the plugin settings for a short moment, when the plugin is unloaded
+    //             the connection then tries to access the settings that have already been deleted
+    //             -> delete this option widget together with the plugin unloading, or get at least notified when the settings are deleted (disconnect this signal then)
+    // connect(&skyConnectManager, &SkyConnectManager::stateChanged,
+    //         this, &MSFSSimConnectOptionWidget::updateUi);
+
     connect(&d->pluginSettings, &MSFSSimConnectSettings::changed,
             this, &MSFSSimConnectOptionWidget::updateUi);
     connect(ui->restoreDefaultsPushButton, &QPushButton::clicked,
             this, &MSFSSimConnectOptionWidget::restoreDefaults);
     connect(ui->connectionComboBox, &QComboBox::currentIndexChanged,
-            this, &MSFSSimConnectOptionWidget::updateInfoText);
+            this, &MSFSSimConnectOptionWidget::updateInfoText);    
 }
 
 void MSFSSimConnectOptionWidget::initUi() noexcept
@@ -128,6 +136,8 @@ void MSFSSimConnectOptionWidget::updateUi() noexcept
     default:
         break;
     }
+    const bool enabled = !SkyConnectManager::getInstance().isActive();
+    ui->connectionComboBox->setEnabled(enabled);
 
     updateInfoText();
 }

diff --git a/src/Plugins/Connect/MSFSSimConnectPlugin/src/MSFSSimConnectSettings.cpp b/src/Plugins/Connect/MSFSSimConnectPlugin/src/MSFSSimConnectSettings.cpp
@@ -55,7 +55,12 @@ MSFSSimConnectSettings::MSFSSimConnectSettings() noexcept
     d(std::make_unique<MSFSSimConnectSettingsPrivate>())
 {}
 
-MSFSSimConnectSettings::~MSFSSimConnectSettings() = default;
+MSFSSimConnectSettings::~MSFSSimConnectSettings()
+{
+#ifdef DEBUG
+    qDebug() << "MSFSSimConnectSettings::~MSFSSimConnectSettings: DELETED";
+#endif
+}
 
 MSFSSimConnectSettings::ConnectionType MSFSSimConnectSettings::getConnectionType() const noexcept
 {

diff --git a/src/UserInterface/src/Dialog/SettingsDialog.cpp b/src/UserInterface/src/Dialog/SettingsDialog.cpp
@@ -166,6 +166,9 @@ void SettingsDialog::frenchConnection() noexcept
     const auto &skyConnectManager = SkyConnectManager::getInstance();
     connect(&skyConnectManager, &SkyConnectManager::connectionChanged,
             this, &SettingsDialog::onSkyConnectPluginChanged);
+    connect(&skyConnectManager, &SkyConnectManager::stateChanged,
+            this, &SettingsDialog::updateUi);
+
     connect(this, &SettingsDialog::accepted,
             this, &SettingsDialog::onAccepted);
     connect(ui->settingsTabWidget, &QTabWidget::currentChanged,
@@ -195,6 +198,8 @@ void SettingsDialog::updateUi() noexcept
     if (pluginName) {
         ui->connectionComboBox->setCurrentText(pluginName.value());
     }
+    const bool enabled = !skyConnectManager.isActive();
+    ui->connectionComboBox->setEnabled(enabled);
     updateConnectionStatus();
 
     // User interface