summaryrefslogtreecommitdiffstats
path: root/src/multimedia/audio
diff options
context:
space:
mode:
authorTarja Sundqvist <tarja.sundqvist@qt.io>2022-09-12 18:29:55 +0300
committerTarja Sundqvist <tarja.sundqvist@qt.io>2022-09-12 18:29:55 +0300
commit981ed7e4ecfcc27cbe9c0492b31f89386335155c (patch)
tree09787eb1f15bd85db2b4a10e031bbe2e3fffd0f1 /src/multimedia/audio
parent34420b12f697484b1cd59e5091a0cc4c7d90e2bc (diff)
parente760a6aae78f6a41ec0430c9e242b449a3a217a8 (diff)
Merge remote-tracking branch 'origin/tqtc/lts-5.15.7' into tqtc/lts-5.15-opensourcev5.15.7-lts-lgpl
Diffstat (limited to 'src/multimedia/audio')
-rw-r--r--src/multimedia/audio/qsoundeffect_pulse_p.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/multimedia/audio/qsoundeffect_pulse_p.cpp b/src/multimedia/audio/qsoundeffect_pulse_p.cpp
index 51cdde026..a141f7e36 100644
--- a/src/multimedia/audio/qsoundeffect_pulse_p.cpp
+++ b/src/multimedia/audio/qsoundeffect_pulse_p.cpp
@@ -552,8 +552,10 @@ void QSoundEffectPrivate::setVolume(qreal volume)
m_volume = qBound(qreal(0), volume, qreal(1));
locker.unlock();
- if (!m_playing && m_pulseStream)
+ if (!m_playing && m_pulseStream) {
+ PulseDaemonLocker locker;
pa_stream_flush(m_pulseStream, volume_stream_flush_callback, m_ref->getRef());
+ }
emit volumeChanged();
}