[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdemultimedia/juk
From:       Michael Pyne <mpyne () kde ! org>
Date:       2012-01-26 2:29:40
Message-ID: 20120126022940.77F03AC892 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1275919 by mpyne:

Use canonicalPath for playlist m3u files.

This is as opposed to absolutePath, which can end up adding the same playlist multiple
times when given the combination of symlinks and stupid folder scan settings.


 M  +2 -2      playlist.cpp  


--- trunk/KDE/kdemultimedia/juk/playlist.cpp #1275918:1275919
@@ -381,7 +381,7 @@
     m_widthsDirty(true),
     m_searchEnabled(true),
     m_lastSelected(0),
-    m_fileName(playlistFile.absoluteFilePath()),
+    m_fileName(playlistFile.canonicalFilePath()),
     m_rmbMenu(0),
     m_toolTip(0),
     m_blockDataChanged(false)
@@ -1880,7 +1880,7 @@
     }
 
     if(importPlaylists && MediaFiles::isPlaylistFile(file) &&
-       !m_collection->containsPlaylistFile(fileInfo.absoluteFilePath()))
+       !m_collection->containsPlaylistFile(fileInfo.canonicalFilePath()))
     {
         new Playlist(m_collection, fileInfo);
         return;
[prev in list] [next in list] [prev in thread] [next in thread]