modules/gui/qt/medialibrary/qml/VideoAll.qml

@@ -99,7 +99,7 @@ FocusScope {
     }
 
     function resetFocus() {
-        if (model.count === 0) return
+        if (!model || model.count === 0) return
 
         var initialIndex = root.initialIndex
 

modules/gui/qt/medialibrary/qml/VideoAllSubDisplay.qml

@@ -213,6 +213,8 @@ VideoAll {
     header: VideoDisplayRecentVideos {
         width: root.width
 
+        subtitleText: (root.model && root.model.count > 0) ? I18n.qtr("Videos") : ""
+
         // NOTE: We want grid items to be visible on the sides.
         leftPadding: root.contentMargin
 

modules/gui/qt/medialibrary/qml/VideoDisplayRecentVideos.qml

@@ -33,6 +33,8 @@ FocusScope {
     property alias leftPadding: recentVideosColumn.leftPadding
     property alias rightPadding: recentVideosColumn.rightPadding
 
+    property alias subtitleText : subtitleLabel.text
+
     // Settings
 
     implicitHeight: recentVideosColumn.height
@@ -84,7 +86,7 @@ FocusScope {
 
             // NOTE: Sometimes, we want items to be visible on the sides.
             displayMarginBeginning: root.leftPadding
-            displayMarginEnd: root.leftPadding
+            displayMarginEnd: root.rightPadding
 
             // NOTE: We want navigation buttons to be centered on the item cover.
             buttonMargin: VLCStyle.margin_xsmall + VLCStyle.gridCover_video_height / 2 - buttonLeft.height / 2
@@ -180,7 +182,9 @@ FocusScope {
         }
 
         Widgets.SubtitleLabel {
-            text: I18n.qtr("Videos")
+            id: subtitleLabel
+
+            visible: text !== ""
         }
     }
 }