Merge pull request #16866 from ksooo/pvr-fix-guideinfo-dialog-crash

Fix CGUIDialogPVRGuideInfo::GetCurrentListItem crash
xbmc · Nov 4, 2019 · a4dfad6 · a4dfad6
2 parents 57f9d06 + 2d5d8f7
commit a4dfad6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/xbmc/pvr/PVRManager.h b/xbmc/pvr/PVRManager.h
@@ -251,12 +251,6 @@ namespace PVR
      */
     void OnPlaybackEnded(const std::shared_ptr<CFileItem> item);
 
-    /*!
-     * @brief Check whether there are active recordings.
-     * @return True if there are active recordings, false otherwise.
-     */
-    bool IsRecording() const;
-
     /*!
      * @brief Let the background thread create epg tags for all channels.
      */

diff --git a/xbmc/pvr/dialogs/GUIDialogPVRGuideInfo.cpp b/xbmc/pvr/dialogs/GUIDialogPVRGuideInfo.cpp
@@ -186,7 +186,10 @@ void CGUIDialogPVRGuideInfo::SetProgInfo(const std::shared_ptr<CPVREpgInfoTag>&
 
 CFileItemPtr CGUIDialogPVRGuideInfo::GetCurrentListItem(int offset)
 {
-  return CFileItemPtr(new CFileItem(m_progItem));
+  if (!m_progItem)
+    return {};
+
+  return std::make_shared<CFileItem>(m_progItem);
 }
 
 void CGUIDialogPVRGuideInfo::OnInitWindow()