mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

ScopeVis: added missing mutex locks in message handling. May fix #955

pull/962/head
f4exb 2021-07-11 10:45:17 +02:00
rodzic 3a3dc0d8c0
commit 785ff0ed12
1 zmienionych plików z 6 dodań i 0 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
sdrbase/dsp/scopevis.cpp
Wyświetl plik

@ -64,6 +64,7 @@ ScopeVis::ScopeVis() :
m_traceDiscreteMemory(GLScopeSettings::m_nbTraceMemories),
m_freeRun(true),
m_maxTraceDelay(0),
m_mutex(QMutex::Recursive),
m_triggerOneShot(false),
m_triggerWaitForReset(false),
m_currentTraceMemoryIndex(0)
@ -943,6 +944,7 @@ bool ScopeVis::handleMessage(const Message& message)
{
if (DSPSignalNotification::match(message))
{
QMutexLocker configLocker(&m_mutex);
DSPSignalNotification& notif = (DSPSignalNotification&) message;
setLiveRate(notif.getSampleRate());
qDebug() << "ScopeVis::handleMessage: DSPSignalNotification: m_sampleRate: " << m_sampleRate;
@ -997,6 +999,7 @@ bool ScopeVis::handleMessage(const Message& message)
}
else if (MsgScopeVisFocusOnTrigger::match(message))
{
QMutexLocker configLocker(&m_mutex);
MsgScopeVisFocusOnTrigger& conf = (MsgScopeVisFocusOnTrigger&) message;
uint32_t triggerIndex = conf.getTriggerIndex();
qDebug() << "ScopeVis::handleMessage: MsgScopeVisFocusOnTrigger: " << triggerIndex;
@ -1040,6 +1043,7 @@ bool ScopeVis::handleMessage(const Message& message)
}
else if (MsgScopeVisFocusOnTrace::match(message))
{
QMutexLocker configLocker(&m_mutex);
MsgScopeVisFocusOnTrace& conf = (MsgScopeVisFocusOnTrace&) message;
uint32_t traceIndex = conf.getTraceIndex();
qDebug() << "ScopeVis::handleMessage: MsgScopeVisFocusOnTrace: " << traceIndex;
@ -1048,6 +1052,7 @@ bool ScopeVis::handleMessage(const Message& message)
}
else if (MsgScopeVisNGOneShot::match(message))
{
QMutexLocker configLocker(&m_mutex);
MsgScopeVisNGOneShot& conf = (MsgScopeVisNGOneShot&) message;
bool oneShot = conf.getOneShot();
qDebug() << "ScopeVis::handleMessage: MsgScopeVisNGOneShot: oneShot:" << oneShot;
@ -1061,6 +1066,7 @@ bool ScopeVis::handleMessage(const Message& message)
}
else if (MsgScopeVisNGMemoryTrace::match(message))
{
QMutexLocker configLocker(&m_mutex);
MsgScopeVisNGMemoryTrace& conf = (MsgScopeVisNGMemoryTrace&) message;
uint32_t memoryIndex = conf.getMemoryIndex();
qDebug() << "ScopeVis::handleMessage: MsgScopeVisNGMemoryTrace: " << memoryIndex;