@ -34,14 +36,23 @@ int SyncMessenger::sendWait(Message& message, unsigned long msPollTime)
@@ -34,14 +36,23 @@ int SyncMessenger::sendWait(Message& message, unsigned long msPollTime)
{
m_message=&message;
m_mutex.lock();
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
m_complete.storeRelaxed(0);
#else
m_complete.store(0);
#endif
emitmessageSent();
while(!m_complete.loadRelaxed())
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
while(!m_complete.loadRelaxed()){
m_waitCondition.wait(&m_mutex,msPollTime);
}
#else
while(!m_complete.load()){
m_waitCondition.wait(&m_mutex,msPollTime);
}
#endif
intresult=m_result;
m_mutex.unlock();
@ -52,7 +63,11 @@ int SyncMessenger::sendWait(Message& message, unsigned long msPollTime)
@@ -52,7 +63,11 @@ int SyncMessenger::sendWait(Message& message, unsigned long msPollTime)
@ -619,15 +620,27 @@ int ScopeVis::processTraces(const SampleVector::const_iterator& cbegin, const Sa
@@ -619,15 +620,27 @@ int ScopeVis::processTraces(const SampleVector::const_iterator& cbegin, const Sa
// display only at trace end if trace time is less than 1 second