Playlist secondary thumbnail cycle correction

Author: sonninnos

menu/cbs/menu_cbs_scan.c

@@ -139,7 +139,7 @@ int action_switch_thumbnail(const char *path,
       if (settings->uints.gfx_thumbnails)
          action_cycle_thumbnail(MENU_ACTION_CYCLE_THUMBNAIL_PRIMARY);
       else
-         action_cycle_thumbnail(MENU_ACTION_CYCLE_THUMBNAIL_PRIMARY);
+         action_cycle_thumbnail(MENU_ACTION_CYCLE_THUMBNAIL_SECONDARY);
 
       if (menu_st->driver_ctx)
       {

menu/menu_driver.c

@@ -7165,9 +7165,10 @@ int action_cycle_thumbnail(unsigned mode)
       if (cur_primary == cur_secondary)
          cur_secondary++;
 
-      /* Wrap secondary to no image, and skip logo */
+      /* Wrap secondary to no image, and skip logo.
+       * If primary disabled, wrap to first image. */
       if (cur_secondary > PLAYLIST_THUMBNAIL_MODE_LAST - PLAYLIST_THUMBNAIL_MODE_OFF - 2)
-         cur_secondary = 0;
+         cur_secondary = (cur_primary) ? 0 : 1;
 
       configuration_set_uint(settings, settings->uints.menu_left_thumbnails, cur_secondary);
    }