comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2025-08-16 04:02:26 -04:00
Code Issues Projects Releases Wiki Activity

Fix crash introduced with #559, fix hanging thread at application termination

Browse Source
This commit is contained in:
vsonnier 2017-08-25 18:52:33 +02:00
parent a018a36100
commit ebca762ea8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/AppFrame.cpp
View File

@ -1700,7 +1700,7 @@ void AppFrame::OnIdle(wxIdleEvent& event) {
} }
//Refresh the current TX antenna on, if any: //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); std::string actualTxAntenna = devInfo->getAntennaName(SOAPY_SDR_TX, 0);
if (currentTXantennaName != actualTxAntenna) { if (currentTXantennaName != actualTxAntenna) {

2
src/process/FFTVisualDataThread.cpp
View File

@ -73,7 +73,7 @@ void FFTVisualDataThread::run() {
fftDistrib.run(); fftDistrib.run();
// Make wproc do a FFT of each of the sample sets provided by fftDistrib: // Make wproc do a FFT of each of the sample sets provided by fftDistrib:
while (!wproc.isInputEmpty()) { while (!stopping && !wproc.isInputEmpty()) {
wproc.run(); wproc.run();
} }
} }