Single-click playlist return from invalid path

Author: sonninnos

menu/cbs/menu_cbs_ok.c

@@ -2897,6 +2897,10 @@ static int action_ok_playlist_entry_collection(const char *path,
          1, 100, true,
          NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_ERROR);
 
+   /* Single-click playlist return */
+   if (settings->bools.input_menu_singleclick_playlists)
+      menu_state_get_ptr()->flags |= MENU_ST_FLAG_PENDING_CLOSE_CONTENT;
+
    if (playlist_initialized && tmp_playlist)
    {
       playlist_free(tmp_playlist);

menu/menu_driver.c

@@ -8022,9 +8022,7 @@ int generic_menu_entry_action(
           * to playlist entry menu */
          if (     (  string_is_equal(parent_label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_RPL_ENTRY_ACTIONS))
                   || string_is_equal(parent_label, msg_hash_to_str(MENU_ENUM_LABEL_EXPLORE_TAB)))
-               && (!string_is_empty(deferred_path)
-               && !string_is_empty(content_path)
-               && string_is_equal(deferred_path, content_path))
+               && !string_is_empty(deferred_path)
             )
          {
             if (string_is_equal(parent_label, msg_hash_to_str(MENU_ENUM_LABEL_EXPLORE_TAB)))