aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xbmc/video/VideoManagerTypes.h3
-rw-r--r--xbmc/video/VideoThumbLoader.cpp4
2 files changed, 6 insertions, 1 deletions
diff --git a/xbmc/video/VideoManagerTypes.h b/xbmc/video/VideoManagerTypes.h
index ab41d512ce..f6dce459d9 100644
--- a/xbmc/video/VideoManagerTypes.h
+++ b/xbmc/video/VideoManagerTypes.h
@@ -8,6 +8,8 @@
#pragma once
+#include <string>
+
enum class VideoAssetTypeOwner
{
UNKNOWN = -1,
@@ -33,6 +35,7 @@ static constexpr int VIDEO_VERSION_ID_BEGIN = 40400;
static constexpr int VIDEO_VERSION_ID_END = 40800;
static constexpr int VIDEO_VERSION_ID_DEFAULT = VIDEO_VERSION_ID_BEGIN;
static constexpr int VIDEO_VERSION_ID_ALL = 0;
+static const std::string VIDEODB_PATH_VERSION_ID_ALL{"videodb://movies/videoversions/0"};
struct VideoAssetInfo
{
diff --git a/xbmc/video/VideoThumbLoader.cpp b/xbmc/video/VideoThumbLoader.cpp
index dac3b7b294..1cb634ac2e 100644
--- a/xbmc/video/VideoThumbLoader.cpp
+++ b/xbmc/video/VideoThumbLoader.cpp
@@ -559,7 +559,9 @@ std::string CVideoThumbLoader::GetEmbeddedThumbURL(const CFileItem &item)
void CVideoThumbLoader::DetectAndAddMissingItemData(CFileItem &item)
{
- if (item.m_bIsFolder) return;
+ // @todo remove exception for hybrid movie/folder of versions
+ if (item.m_bIsFolder && !StringUtils::StartsWith(item.GetPath(), VIDEODB_PATH_VERSION_ID_ALL))
+ return;
if (item.HasVideoInfoTag())
{