sync to trunk

1 files changed, 7 insertions, 1 deletions

diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index 0a7df3eb..02ff5280 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -908,7 +908,13 @@ class Catalog {
                         $songs = $album->get_songs(1);
                         $song = new Song($songs[0]);
                         $dir = dirname($song->file);
-			$extension = substr($image['0']['mime'],strlen($image['0']['mime'])-3,3);
+
+			if ($image['0']['mime'] == 'image/jpeg') { 
+				$extension = 'jpg'; 
+			}
+			else { 
+				$extension = substr($image['0']['mime'],strlen($image['0']['mime'])-3,3);
+			} 
 			
 			// Try the preferred filename, if that fails use folder.???
 	                $preferred_filename = Config::get('album_art_preferred_filename');