From 8f45451df2e773c2c6029180879b09441cc5dd6d Mon Sep 17 00:00:00 2001 From: vsonnier Date: Sat, 6 Jan 2018 16:15:40 +0100 Subject: [PATCH] Choose a valid audio output if the modem-saved one is not recognized. --- src/demod/DemodulatorMgr.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/demod/DemodulatorMgr.cpp b/src/demod/DemodulatorMgr.cpp index 9b449c6..54f0f07 100644 --- a/src/demod/DemodulatorMgr.cpp +++ b/src/demod/DemodulatorMgr.cpp @@ -526,12 +526,20 @@ DemodulatorInstancePtr DemodulatorMgr::loadInstance(DataNode *node) { //Attach to sound output: std::map::iterator i; + + bool matching_device_found = false; + for (i = outputDevices.begin(); i != outputDevices.end(); i++) { if (i->second.name == output_device) { newDemod->setOutputDevice(i->first); + matching_device_found = true; break; } } + //if no device is found, choose the first of the list anyway. + if (!matching_device_found) { + newDemod->setOutputDevice(outputDevices.begin()->first); + } return newDemod; }