Merge pull request f4exb#2001 from mxi-box/device_claim_bugfix

Fix renumberate deviceset without modifying claimed of SamplingDevice
srcejon · Feb 28, 2024 · 2a5c04f · 2a5c04f
2 parents 480241f + 2de9f16
commit 2a5c04f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/sdrbase/device/deviceenumerator.cpp b/sdrbase/device/deviceenumerator.cpp
@@ -17,6 +17,7 @@
 ///////////////////////////////////////////////////////////////////////////////////
 
 #include <QGlobalStatic>
+#include <functional>
 
 #include "deviceenumerator.h"
 
@@ -432,6 +433,20 @@ void DeviceEnumerator::removeMIMOSelection(int tabIndex)
     }
 }
 
+void DeviceEnumerator::renumeratetabIndex(int skippedTabIndex)
+{
+    std::reference_wrapper<DevicesEnumeration> denums[] = {m_rxEnumeration, m_txEnumeration, m_mimoEnumeration};
+    for (DevicesEnumeration &denum : denums)
+    {
+        for (DevicesEnumeration::iterator it = denum.begin(); it != denum.end(); ++it)
+        {
+            if (it->m_samplingDevice.claimed > skippedTabIndex) {
+                it->m_samplingDevice.claimed--;
+            }
+        }
+    }
+}
+
 int DeviceEnumerator::getFileInputDeviceIndex() const
 {
     for (DevicesEnumeration::const_iterator it = m_rxEnumeration.begin(); it != m_rxEnumeration.end(); ++it)

diff --git a/sdrbase/device/deviceenumerator.h b/sdrbase/device/deviceenumerator.h
@@ -52,6 +52,7 @@ class SDRBASE_API DeviceEnumerator : public QObject
     void removeRxSelection(int tabIndex);
     void removeTxSelection(int tabIndex);
     void removeMIMOSelection(int tabIndex);
+    void renumeratetabIndex(int skippedTabIndex);
     int getNbRxSamplingDevices() const { return m_rxEnumeration.size(); }
     int getNbTxSamplingDevices() const { return m_txEnumeration.size(); }
     int getNbMIMOSamplingDevices() const { return m_mimoEnumeration.size(); }

diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp
@@ -1072,6 +1072,7 @@ void MainWindow::removeDeviceSet(int deviceSetIndex)
 
     m_deviceUIs.erase(m_deviceUIs.begin() + deviceSetIndex);
     m_mainCore->removeDeviceSet(deviceSetIndex);
+    DeviceEnumerator::instance()->renumeratetabIndex(deviceSetIndex);
 
     // Renumerate
     for (int i = 0; i < (int) m_deviceUIs.size(); i++)