1 files changed, 8 insertions, 0 deletions

diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index 0ec0f6490c..2e0afab1ee 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -824,7 +824,15 @@ static char *get_token_value(struct gui_wps *gwps,
             return playlist_name(NULL, buf, buf_size);
 
         case WPS_TOKEN_PLAYLIST_POSITION:
+#if CONFIG_CODEC == SWCODEC
             snprintf(buf, buf_size, "%d", id3->index + 1);
+#else
+            /* On HWCODEC, using id3->index doesn't work when shuffle is
+             * enabled, so we get the playlist index directly. To use
+             * id3->index, something like what was added in r3726 would be
+             * required. */
+            snprintf(buf, buf_size, "%d", playlist_get_display_index());
+#endif
             return buf;
 
         case WPS_TOKEN_PLAYLIST_SHUFFLE: