Merge pull request xbmc#24891 from thexai/stacks-warning

stacks: fix Visual Studio warning
thexai · Mar 28, 2024 · 122a369 · 122a369
2 parents bba94b9 + 0be5aa4
commit 122a369
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/xbmc/application/Application.cpp b/xbmc/application/Application.cpp
@@ -2264,7 +2264,7 @@ bool CApplication::PlayStack(CFileItem& item, bool bRestart)
   if (!stackHelper->InitializeStack(item))
     return false;
 
-  std::optional<int> startoffset = stackHelper->InitializeStackStartPartAndOffset(item);
+  std::optional<int64_t> startoffset = stackHelper->InitializeStackStartPartAndOffset(item);
   if (!startoffset)
   {
     CLog::LogF(LOGERROR, "Failed to obtain start offset for stack {}. Aborting playback.",

diff --git a/xbmc/application/ApplicationStackHelper.cpp b/xbmc/application/ApplicationStackHelper.cpp
@@ -81,7 +81,8 @@ bool CApplicationStackHelper::InitializeStack(const CFileItem & item)
   return true;
 }
 
-std::optional<int> CApplicationStackHelper::InitializeStackStartPartAndOffset(const CFileItem& item)
+std::optional<int64_t> CApplicationStackHelper::InitializeStackStartPartAndOffset(
+    const CFileItem& item)
 {
   CVideoDatabase dbs;
   int64_t startoffset = 0;

diff --git a/xbmc/application/ApplicationStackHelper.h b/xbmc/application/ApplicationStackHelper.h
@@ -39,7 +39,7 @@ class CApplicationStackHelper : public IApplicationComponent
   \param item the FileItem object that is the stack
   \returns the part offset if available, nullopt in case of errors
   */
-  std::optional<int> InitializeStackStartPartAndOffset(const CFileItem& item);
+  std::optional<int64_t> InitializeStackStartPartAndOffset(const CFileItem& item);
 
   /*!
   \brief returns the current part number