Merge branch 'v0.18.x'

2014-01-08 22:14:12 +01:00
parent 959d7ca9d0 fdd76b3461
commit 139122c57f
6 changed files with 12 additions and 3 deletions
--- a/src/playlist/PlsPlaylistPlugin.cxx
+++ b/src/playlist/PlsPlaylistPlugin.cxx
@@ -67,7 +67,6 @@ pls_parser(GKeyFile *keyfile, std::forward_list<SongPointer> &songs)
 			FormatError(pls_domain, "Invalid PLS entry %s: '%s'",
 				    key, error->message);
 			g_error_free(error);
-			g_free(key);
 			return;
 		}