comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2025-02-03 09:44:26 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #156 from cjcliffe/master

Browse Source 
Two crash fixes from master branch
This commit is contained in:
Charles J. Cliffe 2015-10-09 12:58:44 -04:00
commit 207d61cd0c
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/audio/AudioThread.cpp
View File

@ -428,7 +428,7 @@ bool AudioThread::isActive() {
void AudioThread::setActive(bool state) { void AudioThread::setActive(bool state) {
AudioThreadInput *dummy; AudioThreadInput *dummy;
if (state && !active) { if (state && !active && inputQueue) {
while (!inputQueue->empty()) { // flush queue while (!inputQueue->empty()) { // flush queue
inputQueue->pop(dummy); inputQueue->pop(dummy);
if (dummy) { if (dummy) {
@ -438,6 +438,7 @@ void AudioThread::setActive(bool state) {
deviceController[parameters.deviceId]->bindThread(this); deviceController[parameters.deviceId]->bindThread(this);
} else if (!state && active) { } else if (!state && active) {
deviceController[parameters.deviceId]->removeThread(this); deviceController[parameters.deviceId]->removeThread(this);
if(inputQueue) {
while (!inputQueue->empty()) { // flush queue while (!inputQueue->empty()) { // flush queue
inputQueue->pop(dummy); inputQueue->pop(dummy);
if (dummy) { if (dummy) {
@ -445,6 +446,7 @@ void AudioThread::setActive(bool state) {
} }
} }
} }
}
active = state; active = state;
} }

8
src/sdr/SDRThread.cpp
View File

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