mirror
/
dl-fldigi
kopia lustrzana https://github.com/jamescoxon/dl-fldigi
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

trx exit 

* fixed bug in exit procedure.  program failed to exit gracefully
    if TRX_STATE was RECEIVE
pull/1/head
David Freese 2015-07-10 09:05:54 -05:00
rodzic 7d881bf76b
commit e477621cf1
1 zmienionych plików z 16 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

21
src/trx/trx.cxx
Wyświetl plik

@ -371,7 +371,8 @@ void trx_trx_transmit_loop()
if (!progdefaults.DTMFstr.empty())
dtmf->send();
if (active_modem->tx_process() < 0)
trx_state = STATE_RX;
if (trx_state != STATE_ABORT)
trx_state = STATE_RX;
}
catch (const SndException& e) {
scard->Close();
@ -382,7 +383,8 @@ void trx_trx_transmit_loop()
}
}
} else
trx_state = STATE_RX;
if (trx_state != STATE_ABORT)
trx_state = STATE_RX;
if (ReedSolomon->assigned(active_modem->get_mode()) &&
progdefaults.TransmitRSid &&
@ -680,11 +682,20 @@ void trx_start(void)
//=============================================================================
void trx_close()
{
int count = 1000;
active_modem->set_stopflag(true);
while (trx_state != STATE_RX && count--)
MilliSleep(10);
if (trx_state != STATE_RX) {
exit(1);
}
count = 1000;
trx_state = STATE_ABORT;
int count = 10;
while (trx_state != STATE_ENDED && count--)
MilliSleep(100);
MilliSleep(10);
if (trx_state != STATE_ENDED) {
exit(2);
}
#if USE_NAMED_SEMAPHORES
if (sem_close(trx_sem) == -1)
LOG_PERROR("sem_close");