From fe7140cb5643e314dd348ce256a08428fdad32f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Fri, 28 Jan 2022 13:44:40 -0500
Subject: [PATCH] avmodel: avoid incorrect iterator
Change-Id: I6e94fc7017a356212a13f6b0fcb0e4cf64abdaaa
---
src/avmodel.cpp | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/avmodel.cpp b/src/avmodel.cpp
index 51cf7824..d5629843 100644
--- a/src/avmodel.cpp
+++ b/src/avmodel.cpp
@@ -296,7 +296,8 @@ AVModel::setDeviceSettings(video::Settings& settings)
// doing this during a call will cause re-invite, this is unwanted
std::unique_lock<std::mutex> lk(pimpl_->renderers_mtx_);
auto it = pimpl_->renderers_.find(video::PREVIEW_RENDERER_ID);
- if (it->second && it->second->isRendering() && pimpl_->renderers_.size() == 1) {
+ if (it != pimpl_->renderers_.end() && it->second && it->second->isRendering()
+ && pimpl_->renderers_.size() == 1) {
lk.unlock();
stopPreview(video::PREVIEW_RENDERER_ID);
startPreview(video::PREVIEW_RENDERER_ID);
@@ -877,9 +878,9 @@ AVModelPimpl::removeRenderer(const QString& id)
return;
}
disconnect(search->second.get(),
- &video::Renderer::frameUpdated,
- this,
- &AVModelPimpl::slotFrameUpdated);
+ &video::Renderer::frameUpdated,
+ this,
+ &AVModelPimpl::slotFrameUpdated);
connect(
search->second.get(),
&video::Renderer::stopped,
--
GitLab