Merge pull request #155 from eoineoineoin/master

Fixes for two crashes
cjcliffe · Oct 8, 2015 · 845c74f · 845c74f
2 parents 7a01c43 + 0b10a5b
commit 845c74f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/audio/AudioThread.cpp b/src/audio/AudioThread.cpp
@@ -428,7 +428,7 @@ bool AudioThread::isActive() {
 void AudioThread::setActive(bool state) {
 
     AudioThreadInput *dummy;
-    if (state && !active) {
+    if (state && !active && inputQueue) {
         while (!inputQueue->empty()) {  // flush queue
             inputQueue->pop(dummy);
             if (dummy) {
@@ -438,10 +438,12 @@ void AudioThread::setActive(bool state) {
         deviceController[parameters.deviceId]->bindThread(this);
     } else if (!state && active) {
         deviceController[parameters.deviceId]->removeThread(this);
-        while (!inputQueue->empty()) {  // flush queue
-            inputQueue->pop(dummy);
-            if (dummy) {
-                dummy->decRefCount();
+        if(inputQueue) {
+            while (!inputQueue->empty()) {  // flush queue
+                inputQueue->pop(dummy);
+                if (dummy) {
+                    dummy->decRefCount();
+                }
             }
         }
     }

diff --git a/src/sdr/SDRThread.cpp b/src/sdr/SDRThread.cpp
@@ -41,8 +41,12 @@ int SDRThread::enumerate_rtl(std::vector<SDRDeviceInfo *> *devs) {
             deviceProduct = product;
             deviceManufacturer = manufact;
 
-            rtlsdr_dev_t *devTest;
-            rtlsdr_open(&devTest, i);
+            rtlsdr_dev_t *devTest = nullptr;
+            if(rtlsdr_open(&devTest, i) < 0)
+            {
+                std::cout << "\tFailed to open device " << i << std::endl;
+                continue;
+            }
 
             std::cout << "\t Tuner type: ";
             switch (rtlsdr_get_tuner_type(devTest)) {