From 4a7bd2edc82147c39b54321f1adc401292221c5a Mon Sep 17 00:00:00 2001 From: ksooo <3226626+ksooo@users.noreply.github.com> Date: Thu, 11 Jul 2024 16:09:03 +0200 Subject: [video] Do not show video info dialog if item has an empty video info tag. --- xbmc/video/windows/GUIWindowVideoBase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbmc/video/windows/GUIWindowVideoBase.cpp b/xbmc/video/windows/GUIWindowVideoBase.cpp index a66e869b77..e8ba199e19 100644 --- a/xbmc/video/windows/GUIWindowVideoBase.cpp +++ b/xbmc/video/windows/GUIWindowVideoBase.cpp @@ -412,7 +412,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(); -- cgit v1.2.3 From 7d70dd71cd728d8e87fd593eae6473ce74fec075 Mon Sep 17 00:00:00 2001 From: ksooo <3226626+ksooo@users.noreply.github.com> Date: Thu, 11 Jul 2024 19:18:36 +0200 Subject: [filesystem] CVideoDatabaseDirectory::GetDirectory: Do not create empty video info tags (which CFileItem::GetVideoInfoTag does if called from non-const methods). Only if the item already has a video info tag, it can have a path which we then set as item's dyn path. --- xbmc/filesystem/VideoDatabaseDirectory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbmc/filesystem/VideoDatabaseDirectory.cpp b/xbmc/filesystem/VideoDatabaseDirectory.cpp index 2c9caa7080..97618694ff 100644 --- a/xbmc/filesystem/VideoDatabaseDirectory.cpp +++ b/xbmc/filesystem/VideoDatabaseDirectory.cpp @@ -105,7 +105,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()); } -- cgit v1.2.3