From 21cafb118a4c137e6dabde68debe4827380a80eb Mon Sep 17 00:00:00 2001 From: sunshinglight Date: Sat, 30 Aug 2025 09:55:56 +0000 Subject: [PATCH] =?UTF-8?q?Revert=20"=E4=BF=AE=E5=A4=8Darm=E8=80=B3?= =?UTF-8?q?=E6=9C=BA=E6=8F=92=E5=85=A5=E5=90=8E=E5=BD=95=E9=9F=B3=E6=8F=92?= =?UTF-8?q?=E6=8B=94=E6=97=A0=E5=A3=B0=E9=97=AE=E9=A2=98"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 47b85be882de4b93d37ef83b6895eda7514237fb. Signed-off-by: sunshinglight Change-Id: I97b98d26fa6def23b773de121f7bae1b223ea41c --- .../server/domain/pipe/src/audio_pipe_manager.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/services/audio_policy/server/domain/pipe/src/audio_pipe_manager.cpp b/services/audio_policy/server/domain/pipe/src/audio_pipe_manager.cpp index 9d68f8d1f5..59c4a0b448 100644 --- a/services/audio_policy/server/domain/pipe/src/audio_pipe_manager.cpp +++ b/services/audio_policy/server/domain/pipe/src/audio_pipe_manager.cpp @@ -45,10 +45,12 @@ void AudioPipeManager::AddAudioPipeInfo(std::shared_ptr info) void AudioPipeManager::RemoveAudioPipeInfo(std::shared_ptr info) { std::unique_lock pLock(pipeListLock_); - for (auto iter = curPipeList_.begin(); iter != curPipeList_.end(); iter++) { + for (auto iter = curPipeList_.begin(); iter != curPipeList_.end();) { if (IsSamePipe(info, *iter)) { AUDIO_INFO_LOG("Remove id:%{public}u, name %{public}s", info->id_, info->name_.c_str()); curPipeList_.erase(iter); + } else { + iter++; } } } @@ -56,10 +58,12 @@ void AudioPipeManager::RemoveAudioPipeInfo(std::shared_ptr info) void AudioPipeManager::RemoveAudioPipeInfo(AudioIOHandle id) { std::unique_lock pLock(pipeListLock_); - for (auto iter = curPipeList_.begin(); iter != curPipeList_.end(); iter++) { + for (auto iter = curPipeList_.begin(); iter != curPipeList_.end();) { if ((*iter)->id_ == id) { AUDIO_INFO_LOG("Remove id:%{public}u, name: %{public}s", id, (*iter)->name_.c_str()); curPipeList_.erase(iter); + } else { + iter++; } } } -- Gitee