aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Sommerfeld <3226626+ksooo@users.noreply.github.com>2024-07-13 21:49:32 +0200
committerGitHub <noreply@github.com>2024-07-13 21:49:32 +0200
commit5c74290f61e93083fb1b292968594cd7ff719e13 (patch)
treefea25166a9e5b81495e5a1c2825359c7ccd6d710
parentfc6c2da7abbe41e598d0c6fa4081007a9cf2f52c (diff)
parent75fb024b9b4481aeeaa563e4b4068cec4ecede17 (diff)
Merge pull request #25482 from ksooo/video-fix-show-info
[video] Do not show video info dialog if item has an empty video info tag
-rw-r--r--xbmc/filesystem/VideoDatabaseDirectory.cpp2
-rw-r--r--xbmc/video/windows/GUIWindowVideoBase.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/xbmc/filesystem/VideoDatabaseDirectory.cpp b/xbmc/filesystem/VideoDatabaseDirectory.cpp
index 4242b095ce..0afa2986dd 100644
--- a/xbmc/filesystem/VideoDatabaseDirectory.cpp
+++ b/xbmc/filesystem/VideoDatabaseDirectory.cpp
@@ -106,7 +106,7 @@ bool CVideoDatabaseDirectory::GetDirectory(const CURL& url, CFileItemList &items
if (!strImage.empty() && CServiceBroker::GetGUI()->GetTextureManager().HasTexture(strImage))
item->SetArt("icon", strImage);
}
- if (item->GetVideoInfoTag())
+ if (item->HasVideoInfoTag())
{
item->SetDynPath(item->GetVideoInfoTag()->GetPath());
}
diff --git a/xbmc/video/windows/GUIWindowVideoBase.cpp b/xbmc/video/windows/GUIWindowVideoBase.cpp
index 95cb103f10..e93b2b02aa 100644
--- a/xbmc/video/windows/GUIWindowVideoBase.cpp
+++ b/xbmc/video/windows/GUIWindowVideoBase.cpp
@@ -416,7 +416,7 @@ bool CGUIWindowVideoBase::ShowInfo(const CFileItemPtr& item2, const ScraperPtr&
}
m_database.Close();
}
- else if(item->HasVideoInfoTag())
+ else if (item->HasVideoInfoTag() && !item->GetVideoInfoTag()->IsEmpty())
{
bHasInfo = true;
movieDetails = *item->GetVideoInfoTag();