Fix crash introduced with #559, fix hanging thread at application termination
This commit is contained in:
parent
a018a36100
commit
ebca762ea8
|
@ -1700,7 +1700,7 @@ void AppFrame::OnIdle(wxIdleEvent& event) {
|
|||
}
|
||||
|
||||
//Refresh the current TX antenna on, if any:
|
||||
if (devInfo) {
|
||||
if ((antennaMenuItems.find(wxID_ANTENNA_CURRENT_TX) != antennaMenuItems.end()) && devInfo) {
|
||||
std::string actualTxAntenna = devInfo->getAntennaName(SOAPY_SDR_TX, 0);
|
||||
|
||||
if (currentTXantennaName != actualTxAntenna) {
|
||||
|
|
|
@ -73,7 +73,7 @@ void FFTVisualDataThread::run() {
|
|||
fftDistrib.run();
|
||||
|
||||
// Make wproc do a FFT of each of the sample sets provided by fftDistrib:
|
||||
while (!wproc.isInputEmpty()) {
|
||||
while (!stopping && !wproc.isInputEmpty()) {
|
||||
wproc.run();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue