From 5e712f3e0249be6dc167c9dcaae417077f724268 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Tue, 30 Aug 2016 18:39:58 +0300
Subject: [PATCH] Merge with develop

---
 code/ryzom/client/src/interface_v3/music_player.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/ryzom/client/src/interface_v3/music_player.cpp b/code/ryzom/client/src/interface_v3/music_player.cpp
index 66d2f099f..3004a3a05 100644
--- a/code/ryzom/client/src/interface_v3/music_player.cpp
+++ b/code/ryzom/client/src/interface_v3/music_player.cpp
@@ -283,7 +283,7 @@ public:
 			// Add songs from playlists
 			for (i = 0; i < playlists.size(); ++i)
 			{
-				addFromPlaylist(filesToProcess[i], filenames);
+				addFromPlaylist(playlists[i], filenames);
 			}
 
 			// Build the songs array