Ticket #10778: patch.lastopenfile.2

--- a/mythtv/mythplugins/mythmusic/mythmusic/metaioid3.cpp      2012-05-25 07:28:27.008411827 +0930
+++ a/mythtv/mythplugins/mythmusic/mythmusic/metaioid3.cpp      2012-05-31 12:28:20.339743559 +0930
@@ -25,7 +25,6 @@ MetaIOID3::MetaIOID3(void)
 
 MetaIOID3::~MetaIOID3(void)
 {
-    CloseFile();
 }
 
 /*!
@@ -162,7 +162,10 @@ bool MetaIOID3::write(const Metadata* md
     TagLib::ID3v2::Tag *tag = GetID3v2Tag();
 
     if (!tag)
+    {
+        CloseFile();
         return false;
+    }
 
     WriteGenericMetadata(tag, mdata);
 
@@ -221,8 +224,12 @@ bool MetaIOID3::write(const Metadata* md
     }
 
     if (!SaveFile())
+    {
+        CloseFile();
         return false;
+    }
 
+    CloseFile();
     return true;
 }
 
@@ -243,7 +250,10 @@ Metadata *MetaIOID3::read(const QString
         TagLib::ID3v1::Tag *tag_v1 = GetID3v1Tag();
 
         if (!tag_v1)
+        {
+            CloseFile();
             return NULL;
+        }
 
         if (!tag_v1->isEmpty())
         {
@@ -342,6 +352,7 @@ Metadata *MetaIOID3::read(const QString
     LOG(VB_FILE, LOG_DEBUG,
             QString("MetaIOID3::read: Length for '%1' from properties is '%2'\n").arg(filename).arg(metadata->Length()));
 
+    CloseFile();
     return metadata;
 }
 
@@ -399,10 +410,12 @@ QImage* MetaIOID3::getAlbumArt(const QSt
                 {
                     picture->loadFromData((const uchar *)frame->picture().data(),
                                          frame->picture().size());
+                    CloseFile();
                     return picture;
                 }
             }
         }
+        CloseFile();
     }
 
     delete picture;
@@ -423,10 +436,14 @@ AlbumArtList MetaIOID3::getAlbumArtList(
     {
         TagLib::ID3v2::Tag *tag = GetID3v2Tag();

         if (!tag)
+        {
+            CloseFile();
             return imageList;
+        }
 
         imageList = readAlbumArt(tag);
+        CloseFile();
     }
 
     return imageList;
@@ -606,7 +624,10 @@ bool MetaIOID3::writeAlbumArt(const QStr
     TagLib::ID3v2::Tag *tag = GetID3v2Tag();
 
     if (!tag)
+    {   
+        CloseFile();
         return false;
+    }
 
     AttachedPictureFrame *apic = findAPIC(tag, type,
                                     QStringToTString(albumart->description));
@@ -628,8 +649,12 @@ bool MetaIOID3::writeAlbumArt(const QStr
     apic->setDescription(QStringToTString(albumart->description));
 
     if (!SaveFile())
+    {   
+        CloseFile();
         return false;
+    }
 
+    CloseFile();
     return true;
 }
 
@@ -675,18 +700,28 @@ bool MetaIOID3::removeAlbumArt(const QSt
     TagLib::ID3v2::Tag *tag = GetID3v2Tag();
 
     if (!tag)
+    {   
+        CloseFile();
         return false;
+    }
 
     AttachedPictureFrame *apic = findAPIC(tag, type,
                                     QStringToTString(albumart->description));
     if (!apic)
+    {   
+        CloseFile();
         return false;
+    }
 
     tag->removeFrame(apic);
 
     if (!SaveFile())
+    {   
+        CloseFile();
         return false;
+    }
 
+    CloseFile();
     return true;
 }
 
@@ -729,7 +764,10 @@ bool MetaIOID3::changeImageType(const QS
     TagLib::ID3v2::Tag *tag = GetID3v2Tag();
 
     if (!tag)
+    {   
+        CloseFile();
         return false;
+    }
 
     AttachedPictureFrame *apic = findAPIC(tag, type,
                                     QStringToTString(albumart->description));
@@ -760,8 +798,12 @@ bool MetaIOID3::changeImageType(const QS
     }
 
     if (!SaveFile())
+    {   
+        CloseFile();
         return false;
+    }
 
+    CloseFile();
     return true;
 }
 
@@ -840,13 +882,20 @@ bool MetaIOID3::writeVolatileMetadata(co
     TagLib::ID3v2::Tag *tag = GetID3v2Tag();
 
     if (!tag)
+    {
+        CloseFile();
         return false;
+    }
 
     bool result = (writeRating(tag, rating) && writePlayCount(tag, playcount));
 
     if (!SaveFile())
+    {
+        CloseFile();
         return false;
+    }
 
+    CloseFile();
     return result;
 }
 
@@ -884,5 +933,7 @@ bool MetaIOID3::TagExists(const QString
         (v1_tag && !v1_tag->isEmpty()))
         retval = true;
 
+    CloseFile();
+
     return retval;
 }