From 9e2c24ef79a73d7eef48d8452d8945d7d7fb07f7 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Sun, 6 Mar 2022 22:52:13 +0100 Subject: [PATCH] Fixed an issue where videos would still play if the video theme configuration was broken. --- es-app/src/views/GamelistLegacy.h | 1 + es-core/src/components/VideoFFmpegComponent.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/es-app/src/views/GamelistLegacy.h b/es-app/src/views/GamelistLegacy.h index b77206d3e..889b9c356 100644 --- a/es-app/src/views/GamelistLegacy.h +++ b/es-app/src/views/GamelistLegacy.h @@ -81,6 +81,7 @@ void GamelistView::legacyPopulateFields() mList.getPosition().y + mSize.y * 0.2125f); mVideoComponents.back()->setSize(mSize.x * (0.5f - 2.0f * padding), mSize.y * 0.4f); mVideoComponents.back()->setDefaultZIndex(30.0f); + mVideoComponents.back()->setVisible(false); addChild(mVideoComponents.back().get()); } diff --git a/es-core/src/components/VideoFFmpegComponent.cpp b/es-core/src/components/VideoFFmpegComponent.cpp index 885b65746..ec019f6ca 100644 --- a/es-core/src/components/VideoFFmpegComponent.cpp +++ b/es-core/src/components/VideoFFmpegComponent.cpp @@ -122,7 +122,7 @@ void VideoFFmpegComponent::resize() void VideoFFmpegComponent::render(const glm::mat4& parentTrans) { - if (!isVisible() || mThemeOpacity == 0.0f) + if (!mVisible || mThemeOpacity == 0.0f) return; if (!mHasVideo && mStaticImagePath == "") @@ -1217,7 +1217,7 @@ bool VideoFFmpegComponent::decoderInitHW() void VideoFFmpegComponent::startVideoStream() { - if (mThemeOpacity == 0.0f) + if (!mVisible || mThemeOpacity == 0.0f) return; mIsPlaying = true;