From 4529cf8f4564fdc62e4bf031af878e239430cd35 Mon Sep 17 00:00:00 2001 From: bruceperens Date: Sat, 8 Mar 2014 01:45:57 +0000 Subject: [PATCH] Exit if a driver isn't opened. git-svn-id: https://svn.code.sf.net/p/freetel/code@1415 01035d8c-6547-0410-b346-abe4f91aad63 --- freedv-server/source/big_main.cpp | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/freedv-server/source/big_main.cpp b/freedv-server/source/big_main.cpp index 24a43324..40e63fa1 100644 --- a/freedv-server/source/big_main.cpp +++ b/freedv-server/source/big_main.cpp @@ -124,9 +124,10 @@ main(int argc, char * * argv) parameter = &colon[1]; } + Base * set = (Base *)1; switch (command) { case 'c': - i.codec = m->codec(driver, parameter); + set = i.codec = m->codec(driver, parameter); break; case 'd': drivers(); @@ -136,10 +137,10 @@ main(int argc, char * * argv) i.fill_in(); break; case 'f': - i.framer = m->framer(driver, parameter); + set = i.framer = m->framer(driver, parameter); break; case 'g': - i.user_interface = m->user_interface(driver, parameter, &i); + set = i.user_interface = m->user_interface(driver, parameter, &i); break; default: case 'h': @@ -147,31 +148,31 @@ main(int argc, char * * argv) exit(1); break; case 'k': - i.keying_output = m->keying_output(driver, parameter); + set = i.keying_output = m->keying_output(driver, parameter); break; case 'l': - i.loudspeaker = m->audio_output(driver, parameter); + set = i.loudspeaker = m->audio_output(driver, parameter); break; case 'm': - i.microphone = m->audio_input(driver, parameter); + set = i.microphone = m->audio_input(driver, parameter); break; case 'M': - i.modem = m->modem(driver, parameter); + set = i.modem = m->modem(driver, parameter); break; case 'p': - i.ptt_input_digital = m->ptt_input(driver, parameter); + set = i.ptt_input_digital = m->ptt_input(driver, parameter); break; case 'P': - i.ptt_input_ssb = m->ptt_input(driver, parameter); + set = i.ptt_input_ssb = m->ptt_input(driver, parameter); break; case 'r': - i.receiver = m->audio_input(driver, parameter); + set = i.receiver = m->audio_input(driver, parameter); break; case 't': - i.transmitter = m->audio_output(driver, parameter); + set = i.transmitter = m->audio_output(driver, parameter); break; case 'x': - i.text_input = m->text_input(driver, parameter); + set = i.text_input = m->text_input(driver, parameter); break; case 'C': i.fill_in(); @@ -181,6 +182,8 @@ main(int argc, char * * argv) case 0: break; } + if ( set == 0 ) + exit(1); } } else { // argc <= 1 -- 2.25.1