4 files changed, 12 insertions, 6 deletions
diff --git a/src/plugins/Input/flac/flacmetadatamodel.cpp b/src/plugins/Input/flac/flacmetadatamodel.cpp
index 47841eeb7..3dc2ab5b5 100644
--- a/src/plugins/Input/flac/flacmetadatamodel.cpp
+++ b/src/plugins/Input/flac/flacmetadatamodel.cpp
@@ -258,7 +258,7 @@ void VorbisCommentModel::setValue(Qmmp::MetaData key, const QString &value)
         return;
     case Qmmp::DISCNUMBER:
         value == "0" ?
-        m_tag->removeField("DISCNUMBER"):
+        m_tag->removeFields("DISCNUMBER"):
         m_tag->addField("DISCNUMBER", str, true);
     }
 }
diff --git a/src/plugins/Input/mpeg/mpegmetadatamodel.cpp b/src/plugins/Input/mpeg/mpegmetadatamodel.cpp
index a9ecad0ce..c672f39ce 100644
--- a/src/plugins/Input/mpeg/mpegmetadatamodel.cpp
+++ b/src/plugins/Input/mpeg/mpegmetadatamodel.cpp
@@ -299,12 +299,18 @@ void MpegFileTagModel::setValue(Qmmp::MetaData key, const QString &value)
             else if (m_codec->name().contains("UTF-16BE"))
                 type = TagLib::String::UTF16BE;
 
-            m_codec = QTextCodec::codecForName ("UTF-8");
+
             TagLib::ID3v2::FrameFactory *factory = TagLib::ID3v2::FrameFactory::instance();
             factory->setDefaultTextEncoding(type);
-            m_file->setID3v2FrameFactory(factory);
+            m_codec = QTextCodec::codecForName("UTF-8");
             type = TagLib::String::UTF8;
         }
+        else
+        {
+            TagLib::ID3v2::FrameFactory *factory = TagLib::ID3v2::FrameFactory::instance();
+            factory->setDefaultTextEncoding(TagLib::String::Latin1);
+        }
+
         //save additional tags
         TagLib::ByteVector id3v2_key;
         if(key == Qmmp::ALBUMARTIST)
@@ -403,7 +409,7 @@ void MpegFileTagModel::remove()
 void MpegFileTagModel::save()
 {
     if(m_tag)
-        m_file->save(m_tagType, false);
+        m_file->save(m_tagType, TagLib::File::StripNone);
     else
         m_file->strip(m_tagType);
 }
diff --git a/src/plugins/Input/opus/opusmetadatamodel.cpp b/src/plugins/Input/opus/opusmetadatamodel.cpp
index bc132a5a6..5ada72d2e 100644
--- a/src/plugins/Input/opus/opusmetadatamodel.cpp
+++ b/src/plugins/Input/opus/opusmetadatamodel.cpp
@@ -239,7 +239,7 @@ void VorbisCommentModel::setValue(Qmmp::MetaData key, const QString &value)
         return;
     case Qmmp::DISCNUMBER:
         value == "0" ?
-        m_tag->removeField("DISCNUMBER"):
+        m_tag->removeFields("DISCNUMBER"):
         m_tag->addField("DISCNUMBER", str, true);
     }
 }
diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
index 3ff4c8c46..5484231e8 100644
--- a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
+++ b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
@@ -227,7 +227,7 @@ void VorbisCommentModel::setValue(Qmmp::MetaData key, const QString &value)
         return;
     case Qmmp::DISCNUMBER:
         value == "0" ?
-        tag->removeField("DISCNUMBER"):
+        tag->removeFields("DISCNUMBER"):
         tag->addField("DISCNUMBER", str, true);
     }
 }