Merge pull request xbmc#1356 from fetzerch/bugfix-isostack

bugfix: fixed initial playback of stacked iso images
Montellese · Sep 8, 2012 · fabf961 · fabf961
2 parents f204d9b + 6624886
commit fabf961
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
@@ -3891,14 +3891,23 @@ bool CApplication::PlayStack(const CFileItem& item, bool bRestart)
         CLog::Log(LOGERROR, "%s - Cannot open VideoDatabase", __FUNCTION__);
     }
 
-    // set startoffset in movieitem, track stack item for updating purposes, and finally play disc part
-    if (selectedFile > 0 && selectedFile <= (int)movieList.Size())
+    // make sure that the selected part is within the boundaries
+    if (selectedFile <= 0)
+    {
+      CLog::Log(LOGWARNING, "%s - Selected part %d out of range, playing part 1", __FUNCTION__, selectedFile);
+      selectedFile = 1;
+    }
+    else if (selectedFile > movieList.Size())
     {
-      movieList[selectedFile - 1]->m_lStartOffset = startoffset > 0 ? STARTOFFSET_RESUME : 0;
-      movieList[selectedFile - 1]->SetProperty("stackFileItemToUpdate", true);
-      *m_stackFileItemToUpdate = item;
-      return PlayFile(*(movieList[selectedFile - 1]));
+      CLog::Log(LOGWARNING, "%s - Selected part %d out of range, playing part %d", __FUNCTION__, selectedFile, movieList.Size());
+      selectedFile = movieList.Size();
     }
+
+    // set startoffset in movieitem, track stack item for updating purposes, and finally play disc part
+    movieList[selectedFile - 1]->m_lStartOffset = startoffset > 0 ? STARTOFFSET_RESUME : 0;
+    movieList[selectedFile - 1]->SetProperty("stackFileItemToUpdate", true);
+    *m_stackFileItemToUpdate = item;
+    return PlayFile(*(movieList[selectedFile - 1]));
   }
   // case 2: all other stacks
   else

diff --git a/xbmc/FileItem.cpp b/xbmc/FileItem.cpp
@@ -80,7 +80,7 @@ CFileItem::CFileItem(const CSong& song)
   m_strPath = song.strFileName;
   GetMusicInfoTag()->SetSong(song);
   m_lStartOffset = song.iStartOffset;
-  m_lStartPartNumber = 0;
+  m_lStartPartNumber = 1;
   SetProperty("item_start", song.iStartOffset);
   m_lEndOffset = song.iEndOffset;
   m_strThumbnailImage = song.strThumb;
@@ -566,7 +566,7 @@ void CFileItem::Reset()
   m_dateTime.Reset();
   m_iDriveType = CMediaSource::SOURCE_TYPE_UNKNOWN;
   m_lStartOffset = 0;
-  m_lStartPartNumber = 0;
+  m_lStartPartNumber = 1;
   m_lEndOffset = 0;
   m_iprogramCount = 0;
   m_idepth = 1;