diff options
| author | Mikko Hallamaa <mikko.hallamaa@qt.io> | 2024-03-20 14:47:10 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-03-21 13:35:33 +0000 |
| commit | 0ff1f255dd0c798c36057c184c529e83b48b0ea4 (patch) | |
| tree | 0e886a7e01aefcaa8f7577b983b0910a71521999 | |
| parent | d9a09602458c4763f04131c4b6951e4295b2a07e (diff) | |
Reset error when calling QPulseAudioSource::reset()
QPulseAudioSource::reset() called stop() which changes the state to
Stopped without resetting any possible error and then calls close().
This patch changes reset() to reset the error to NoError, and then
calls close(). This behavior is the same as in QPulseAudioSink::reset().
Pick-to: 6.5
Change-Id: If5e1a189812fbbfbd39e43948bb5b07955997224
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit a39d9c31245cc42f25da0886c7d28d4f763707bf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit d452a99af057bf354a48e7ba1ddecbeb704cf5ec)
| -rw-r--r-- | src/multimedia/pulseaudio/qpulseaudiosource.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/multimedia/pulseaudio/qpulseaudiosource.cpp b/src/multimedia/pulseaudio/qpulseaudiosource.cpp index 4be3afd5e..ff92244a6 100644 --- a/src/multimedia/pulseaudio/qpulseaudiosource.cpp +++ b/src/multimedia/pulseaudio/qpulseaudiosource.cpp @@ -528,7 +528,8 @@ void QPulseAudioSource::userFeed() void QPulseAudioSource::reset() { - stop(); + if (auto notifier = m_stateMachine.stopOrUpdateError()) + close(); } void QPulseAudioSource::onPulseContextFailed() |