From 7ab8b82bcc95ec5e11ef40300eb07c6d180c1ec9 Mon Sep 17 00:00:00 2001 From: Leon Styhre <leon@leonstyhre.com> Date: Fri, 11 Aug 2023 19:38:38 +0200 Subject: [PATCH] The media viewer now only stops info popups if there is actually any media to display --- es-app/src/MediaViewer.cpp | 2 ++ es-core/src/Window.cpp | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/es-app/src/MediaViewer.cpp b/es-app/src/MediaViewer.cpp index e7d9c93dc..4481e697e 100644 --- a/es-app/src/MediaViewer.cpp +++ b/es-app/src/MediaViewer.cpp @@ -52,6 +52,8 @@ bool MediaViewer::startMediaViewer(FileData* game) if (!mHasVideo && !mHasImages) return false; + Window::getInstance()->stopInfoPopup(); + HelpStyle style; style.font = Font::get(FONT_SIZE_MINI); style.origin = {0.5f, 0.5f}; diff --git a/es-core/src/Window.cpp b/es-core/src/Window.cpp index 98c25afea..d83336937 100644 --- a/es-core/src/Window.cpp +++ b/es-core/src/Window.cpp @@ -894,7 +894,6 @@ void Window::renderScreensaver() void Window::startMediaViewer(FileData* game) { if (mMediaViewer) { - stopInfoPopup(); if (mMediaViewer->startMediaViewer(game)) { setAllowTextScrolling(false); setAllowFileAnimation(false);