Merge pull request xbmc#24652 from ksooo/video-versions-fix-infodialo…

…g-playback [video] Fix video info dialog play button to always play the version …
Memphiz · Feb 6, 2024 · 2237f2c · 2237f2c
2 parents ca059b3 + a5316f7
commit 2237f2c
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/xbmc/video/dialogs/GUIDialogVideoInfo.cpp b/xbmc/video/dialogs/GUIDialogVideoInfo.cpp
@@ -753,11 +753,19 @@ class CVideoPlayActionProcessor : public VIDEO::GUILIB::CVideoPlayActionProcesso
 private:
   void Play()
   {
-    m_item->SetProperty("playlist_type_hint", PLAYLIST::TYPE_VIDEO);
-    const ContentUtils::PlayMode mode{m_item->GetProperty("CheckAutoPlayNextItem").asBoolean()
+    auto item{m_item};
+    if (item->m_bIsFolder && item->HasVideoVersions())
+    {
+      //! @todo get rid of "videos with versions as folder" hack!
+      item = std::make_shared<CFileItem>(*item);
+      item->m_bIsFolder = false;
+    }
+
+    item->SetProperty("playlist_type_hint", PLAYLIST::TYPE_VIDEO);
+    const ContentUtils::PlayMode mode{item->GetProperty("CheckAutoPlayNextItem").asBoolean()
                                           ? ContentUtils::PlayMode::CHECK_AUTO_PLAY_NEXT_ITEM
                                           : ContentUtils::PlayMode::PLAY_ONLY_THIS};
-    VIDEO_UTILS::PlayItem(m_item, "", mode);
+    VIDEO_UTILS::PlayItem(item, "", mode);
   }
 };
 } // unnamed namespace