Merge pull request #11041 from phil65/playlist_position

[gui] return "" instead of "0" for playlist.position in case nothing is playing
xbmc · Dec 10, 2016 · c23f7d8 · c23f7d8
2 parents 4d09cd1 + 13fd504
commit c23f7d8
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp
@@ -8427,7 +8427,9 @@ std::string CGUIInfoManager::GetPlaylistLabel(int item, int playlistid /* = PLAY
     }
   case PLAYLIST_POSITION:
     {
-      return StringUtils::Format("%i", g_playlistPlayer.GetCurrentSong() + 1);
+      int currentSong = g_playlistPlayer.GetCurrentSong();
+      if (currentSong > -1)
+        return StringUtils::Format("%i", currentSong + 1);
     }
   case PLAYLIST_RANDOM:
     {