potential fix for #1361

AlexandreRouma · Apr 8, 2024 · d12021f · d12021f
1 parent db1682a
commit d12021f
Showing 1 changed file with 23 additions and 3 deletions.
diff --git a/source_modules/soapy_source/src/main.cpp b/source_modules/soapy_source/src/main.cpp
@@ -81,8 +81,15 @@ class SoapyModule : public ModuleManager::Instance {
 
 private:
     void refresh() {
-        devList = SoapySDR::Device::enumerate();
         txtDevList = "";
+        try {
+            devList = SoapySDR::Device::enumerate();
+        }
+        catch (const std::exception& e) {
+            flog::error("Could not list devices: {}", e.what());
+            return;
+        }
+
         int i = 0;
         for (auto& dev : devList) {
             txtDevList += dev["label"] != "" ? dev["label"] : dev["driver"];
@@ -153,7 +160,14 @@ class SoapyModule : public ModuleManager::Instance {
             return;
         }
 
-        SoapySDR::Device* dev = SoapySDR::Device::make(devArgs);
+        SoapySDR::Device* dev = NULL;
+        try {
+            dev = SoapySDR::Device::make(devArgs);
+        }
+        catch (const std::exception& e) {
+            flog::error("Could not open device: {}", e.what());
+            return;
+        }
 
         antennaList = dev->listAntennas(SOAPY_SDR_RX, channelId);
         txtAntennaList = "";
@@ -307,7 +321,13 @@ class SoapyModule : public ModuleManager::Instance {
             return;
         }
 
-        _this->dev = SoapySDR::Device::make(_this->devArgs);
+        try {
+            _this->dev = SoapySDR::Device::make(_this->devArgs);
+        }
+        catch (const std::exception& e) {
+            flog::error("Failed to open device: {}", e.what());
+            return;
+        }
 
         _this->dev->setSampleRate(SOAPY_SDR_RX, _this->channelId, _this->sampleRate);