fix non-lab build

This commit is contained in:
Charles J. Cliffe 2015-11-19 00:39:14 -05:00
parent e9f8869312
commit cf5cefbf6c
2 changed files with 4 additions and 4 deletions

View File

@ -912,7 +912,7 @@ void AppFrame::OnIdle(wxIdleEvent& event) {
}
#else
// basic demodulators
if (dSelection != -1 && dSelection != demod->getDemodulatorType()) {
if (dSelection != "" && dSelection != demod->getDemodulatorType()) {
demod->setDemodulatorType(dSelection);
}
#endif
@ -974,7 +974,7 @@ void AppFrame::OnIdle(wxIdleEvent& event) {
}
#else
// basic demodulators
if (dSelection != -1 && dSelection != mgr->getLastDemodulatorType()) {
if (dSelection != "" && dSelection != mgr->getLastDemodulatorType()) {
mgr->setLastDemodulatorType(dSelection);
}
#endif

View File

@ -312,7 +312,7 @@ int DemodulatorInstance::getDemodulatorLock() {
return ((ModemDigital *)cModem)->getDemodulatorLock();
}
return -1;
return 0;
}
void DemodulatorInstance::setDemodulatorCons(int demod_cons_in) {
@ -327,7 +327,7 @@ int DemodulatorInstance::getDemodulatorCons() {
if (cModem && cModem->getType() == "digital") {
return ((ModemDigital *)cModem)->getDemodulatorCons();
}
return -1;
return 0;
}
void DemodulatorInstance::setBandwidth(int bw) {