Single-click playlist Explore fixes

Author: sonninnos

menu/drivers/materialui.c

@@ -10409,7 +10409,21 @@ static enum menu_action materialui_parse_menu_entry_action(
          if (     config_get_ptr()->bools.input_menu_singleclick_playlists
                && (  mui->flags & MUI_FLAG_IS_PLAYLIST
                   || mui->flags & MUI_FLAG_IS_EXPLORE_LIST))
+         {
+            if (mui->flags & MUI_FLAG_IS_EXPLORE_LIST)
+            {
+#if defined(HAVE_LIBRETRODB)
+               menu_entry_t entry;
+               MENU_ENTRY_INITIALIZE(entry);
+               menu_entry_get(&entry, 0, menu_st->selection_ptr, NULL, true);
+               if (     entry.type == FILE_TYPE_RDB
+                     || entry.type == FILE_TYPE_PLAIN
+                     || !menu_explore_is_content_list())
+                  break;
+#endif
+            }
             mui->transition_alpha_lock = true;
+         }
          break;
       case MENU_ACTION_CANCEL:
          if (mui->flags & MUI_FLAG_SHOW_FULLSCREEN_THUMBNAILS)

menu/drivers/ozone.c

@@ -8708,7 +8708,21 @@ static enum menu_action ozone_parse_menu_entry_action(
          if (     settings->bools.input_menu_singleclick_playlists
                && (  ozone->flags & OZONE_FLAG_IS_PLAYLIST
                   || ozone->flags & OZONE_FLAG_IS_EXPLORE_LIST))
+         {
+            if (ozone->flags & OZONE_FLAG_IS_EXPLORE_LIST)
+            {
+#if defined(HAVE_LIBRETRODB)
+               menu_entry_t entry;
+               MENU_ENTRY_INITIALIZE(entry);
+               menu_entry_get(&entry, 0, menu_st->selection_ptr, NULL, true);
+               if (     entry.type == FILE_TYPE_RDB
+                     || entry.type == FILE_TYPE_PLAIN
+                     || !menu_explore_is_content_list())
+                  break;
+#endif
+            }
             ozone->animations.list_alpha = 0.0f;
+         }
          break;
       case MENU_ACTION_CANCEL:
          ozone->flags &= ~OZONE_FLAG_CURSOR_MODE;
@@ -12451,7 +12465,7 @@ static void ozone_list_open(
          ozone->sidebar_offset = -ozone->dimensions_sidebar_width;
    }
 
-   if (animate)
+   if (animate && ozone->animations.list_alpha != 0.0f)
    {
       ozone->animations.list_alpha = 0.0f;
 

menu/drivers/rgui.c

@@ -8074,7 +8074,21 @@ static enum menu_action rgui_parse_menu_entry_action(
          if (     config_get_ptr()->bools.input_menu_singleclick_playlists
                && (  rgui->flags & RGUI_FLAG_IS_PLAYLIST
                   || rgui->flags & RGUI_FLAG_IS_EXPLORE_LIST))
+         {
+            if (rgui->flags & RGUI_FLAG_IS_EXPLORE_LIST)
+            {
+#if defined(HAVE_LIBRETRODB)
+               menu_entry_t entry;
+               MENU_ENTRY_INITIALIZE(entry);
+               menu_entry_get(&entry, 0, menu_st->selection_ptr, NULL, true);
+               if (     entry.type == FILE_TYPE_RDB
+                     || entry.type == FILE_TYPE_PLAIN
+                     || !menu_explore_is_content_list())
+                  break;
+#endif
+            }
             rgui->flags |= RGUI_FLAG_DRAW_ENTRY_SKIP;
+         }
          break;
       case MENU_ACTION_CANCEL:
          if (rgui->flags & RGUI_FLAG_SHOW_FULLSCREEN_THUMBNAIL)

menu/drivers/xmb.c

@@ -5847,7 +5847,21 @@ static enum menu_action xmb_parse_menu_entry_action(
          /* Make transition smoother for single-click playlist launching */
          if (     config_get_ptr()->bools.input_menu_singleclick_playlists
                && (xmb->is_playlist || xmb->is_explore_list))
+         {
+            if (xmb->is_explore_list)
+            {
+#if defined(HAVE_LIBRETRODB)
+               menu_entry_t entry;
+               MENU_ENTRY_INITIALIZE(entry);
+               menu_entry_get(&entry, 0, menu_st->selection_ptr, NULL, true);
+               if (     entry.type == FILE_TYPE_RDB
+                     || entry.type == FILE_TYPE_PLAIN
+                     || !menu_explore_is_content_list())
+                  break;
+#endif
+            }
             xmb->alpha_list = 0.0f;
+         }
          break;
       case MENU_ACTION_CANCEL:
          if (xmb->is_state_slot)