[video] Fix setting artwork for videos with multiple versions via vid…

…eo info dialog's 'choose art' button or 'choose art' context menu item.
xbmc · Jan 5, 2024 · 16c7475 · 16c7475
1 parent 9e57727
commit 16c7475
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/xbmc/video/VideoItemArtworkHandler.cpp b/xbmc/video/VideoItemArtworkHandler.cpp
@@ -134,8 +134,21 @@ void CVideoItemArtworkHandler::PersistArt(const std::string& art)
     return;
   }
 
-  videodb.SetArtForItem(m_item->GetVideoInfoTag()->m_iDbId, m_item->GetVideoInfoTag()->m_type,
-                        m_artType, art);
+  bool allPersisted{false};
+  if (m_item->HasVideoVersions())
+  {
+    // write video version artwork data to database
+    const auto* tag = m_item->GetVideoInfoTag();
+    videodb.SetArtForItem(tag->m_iFileId, MediaTypeVideoVersion, m_artType, art);
+
+    // additionally, write default version artwork data to database, for compatibility reasons
+    allPersisted = !tag->IsDefaultVideoVersion();
+  }
+  if (!allPersisted)
+  {
+    videodb.SetArtForItem(m_item->GetVideoInfoTag()->m_iDbId, m_item->GetVideoInfoTag()->m_type,
+                          m_artType, art);
+  }
 }
 
 void CVideoItemArtworkHandler::AddItemPathStringToFileBrowserSources(

diff --git a/xbmc/video/dialogs/GUIDialogVideoManagerVersions.cpp b/xbmc/video/dialogs/GUIDialogVideoManagerVersions.cpp
@@ -169,6 +169,9 @@ void CGUIDialogVideoManagerVersions::SetDefaultVideoVersion(const CFileItem& ver
   // set the specified video version as default
   m_database.SetDefaultVideoVersion(itemType, dbId, version.GetVideoInfoTag()->m_iDbId);
 
+  // update default artwork
+  m_database.SetArtForItem(dbId, m_videoAsset->GetVideoInfoTag()->m_type, version.GetArt());
+
   // update the video item
   m_videoAsset->SetPath(version.GetPath());
   m_videoAsset->SetDynPath(version.GetPath());