From ab170b1aff8a07aea26bc139ed1bf77f06c95b88 Mon Sep 17 00:00:00 2001
From: Marcos CARDINOT <mcardinot@gmail.com>
Date: Mon, 5 May 2014 01:59:39 +0100
Subject: fixed bug with saved filename: add ext

---
 src/library/coverart.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/library/coverart.cpp')

diff --git a/src/library/coverart.cpp b/src/library/coverart.cpp
index 1298b9eef7..5dcca0e077 100644
--- a/src/library/coverart.cpp
+++ b/src/library/coverart.cpp
@@ -37,25 +37,28 @@ QString CoverArt::searchCoverArtFile(TrackInfoObject* pTrack) {
 
     // Some image extensions
     QStringList extList;
-    extList << "jpg" << "jpeg" << "png" << "gif" << "bmp";
+    extList << ".jpg" << ".jpeg" << ".png" << ".gif" << ".bmp";
 
     //
     // Step 1: Look for cover art in cache directory.
     //
     foreach (QString ext, extList) {
         if(QFile::exists(coverArtLocation + ext)) {
-            return coverArtLocation + "." + ext;
+            return coverArtLocation + ext;
         }
     }
+    coverArtLocation.append(".");
+    coverArtLocation.append(defaultImageFormat);
 
     //
     // Step 2: Look for embedded cover art.
     //
     QImage image = pTrack->getCoverArt();
+
     // If the track has embedded cover art, store it
     if (!image.isNull()) {
         if(image.save(coverArtLocation, defaultImageFormat)) {
-            return coverArtLocation + "." + defaultImageFormat;
+            return coverArtLocation;
         }
     }
 
@@ -81,7 +84,7 @@ QString CoverArt::searchCoverArtFile(TrackInfoObject* pTrack) {
             if (filename.contains(re)) {
                 QImage image(f.absoluteFilePath());
                 if (image.save(coverArtLocation, defaultImageFormat)) {
-                    return coverArtLocation + "." + defaultImageFormat;
+                    return coverArtLocation;
                 }
                 break;
             }
-- 
cgit v1.2.3