diff --git a/QnetGateway.cpp b/QnetGateway.cpp index e17fc16..4e0bccf 100644 --- a/QnetGateway.cpp +++ b/QnetGateway.cpp @@ -2508,6 +2508,7 @@ bool CQnetGateway::Init(char *cfgfile) CQnetGateway::CQnetGateway() { + ii = NULL; } CQnetGateway::~CQnetGateway() @@ -2537,8 +2538,10 @@ CQnetGateway::~CQnetGateway() } } - ii->close(); - delete ii; + if (ii) { + ii->close(); + delete ii; + } printf("QnetGateway exiting\n"); } diff --git a/README.md b/README.md index 2421b3d..0df7d0f 100644 --- a/README.md +++ b/README.md @@ -7,13 +7,9 @@ The Qnet Gateway program now includes support for Icom's new Terminal Mode and A QnetGateway now supports MMDVM modems directly, without the need for MMDVMHost. This is for hams that want to use their MMDVM devices and create a hot-spot for D-Star mode only. (You still can talk to your friends on other modes by gathering at multi-mode reflectors, like the QuadNet Array!) -For building a QnetGateway + MMDVMHost system, see the MMDVM.README file. To build QnetGateway that uses a DVAP Dongle or DVRPTR V1, see the CONFIG+INSTALL file. To build QnetGateway for an Icom Repeater Stack, switch to another branch after cloning the repository: +For building a QnetGateway + MMDVMHost system, see the MMDVM.README file. To build QnetGateway that uses a DVAP Dongle or DVRPTR V1, see the CONFIG+INSTALL file. To build QnetGateway for an Icom Repeater Stack, I have another repo at QnetIcomGateway. Detailed information is available there. -``` -git checkout lastudp -``` - -To get started, clone the software to your Linux device: +To get started with an MMDVM-modem, DVAP, DVRPTR or Icom Terminal and/or Access Point system, clone this software to your Linux device: ``` git clone git://github.com/n7tae/QnetGateway.git diff --git a/qnconfig b/qnconfig index d470500..4b49206 100755 --- a/qnconfig +++ b/qnconfig @@ -140,28 +140,28 @@ FileMenu () { fi echo echo " Additional entries in log files (in /usr/local/var)" - echo -n "cl : Call(QSO) logging :"; EvaluateVar log_qso{,_d} - echo -n "il : IRC logging :"; EvaluateVar log_irc{,_d} - echo -n "dl : DTMF logging :"; EvaluateVar log_dtmf{,_d} - echo -n "xl : Debug logging :"; EvaluateVar log_debug{,_d} + echo -n "cl : Call(QSO) logging = "; EvaluateVar log_qso{,_d} + echo -n "il : IRC logging = "; EvaluateVar log_irc{,_d} + echo -n "dl : DTMF logging = "; EvaluateVar log_dtmf{,_d} + echo -n "xl : Debug logging = "; EvaluateVar log_debug{,_d} echo " WARNING debug logging can produce large log file!" if [ -n "$em" ]; then echo echo " Files and directories" - echo -n "sf : Repeater status file :"; EvaluateVar file_status{,_d} - echo -n "ed : Echo/Voicemail directory :"; EvaluateVar file_echotest{,_d} - echo -n "dd : DTMF directory :"; EvaluateVar file_dtmf{,_d} - echo -n "vf : QnetVoice filename :"; EvaluateVar file_qnvoicefile{,_d} - echo -n "gf : Gateways filename :"; EvaluateVar file_gwys{,_d} - echo -n "ad : Announce directory :"; EvaluateVar file_announce_dir{,_d} + echo -n "sf : Repeater status file = "; EvaluateVar file_status{,_d} + echo -n "ed : Echo/Voicemail directory = "; EvaluateVar file_echotest{,_d} + echo -n "dd : DTMF directory = "; EvaluateVar file_dtmf{,_d} + echo -n "vf : QnetVoice filename = "; EvaluateVar file_qnvoicefile{,_d} + echo -n "gf : Gateways filename = "; EvaluateVar file_gwys{,_d} + echo -n "ad : Announce directory = "; EvaluateVar file_announce_dir{,_d} echo echo " Timing controls" - echo -n "et : Echo timeout (sec) :"; EvaluateVar timing_timeout_echo{,_d} - echo -n "vt : Voicemail timeout (sec) :"; EvaluateVar timing_timeout_voicemail{,_d} - echo -n "gt : G2 timeout (sec) :"; EvaluateVar timing_timeout_remote_g2{,_d} - echo -n "rt : Repeater timeout (sec) :"; EvaluateVar timing_timeout_local_rptr{,_d} - echo -n "pw : Echo play wait (sec) :"; EvaluateVar timing_play_wait{,_d} - echo -n "pd : Echo play delay (msec) :"; EvaluateVar timing_play_delay{,_d} + echo -n "et : Echo timeout (sec) = "; EvaluateVar timing_timeout_echo{,_d} + echo -n "vt : Voicemail timeout (sec) = "; EvaluateVar timing_timeout_voicemail{,_d} + echo -n "gt : G2 timeout (sec) = "; EvaluateVar timing_timeout_remote_g2{,_d} + echo -n "rt : Repeater timeout (sec) = "; EvaluateVar timing_timeout_local_rptr{,_d} + echo -n "pw : Echo play wait (sec) = "; EvaluateVar timing_play_wait{,_d} + echo -n "pd : Echo play delay (msec) = "; EvaluateVar timing_play_delay{,_d} fi EndMenu