From 9df142bdf6065384587ab46d8ad6372b397c93b6 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 17 Aug 2017 19:03:42 +0200
Subject: [PATCH] Adjust constraints for ID3 tag conversion

---
 mediafileinfo.cpp | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/mediafileinfo.cpp b/mediafileinfo.cpp
index 465303a..5c98c0d 100644
--- a/mediafileinfo.cpp
+++ b/mediafileinfo.cpp
@@ -1374,15 +1374,14 @@ void MediaFileInfo::mergeId3v2Tags()
  *
  * Effectively merges all ID3 tags into a single ID3v2 tag.
  *
- * Does nothing if there are currently no ID3 tags assigned and the file format
- * isn't known to support ID3 tags.
- *
- * This method does nothing the tags of the current file haven't been parsed using
- * the parseTags() method.
+ * \remarks Does nothing if
+ * - there is no ID3v1 tag assigned.
+ * - the file format isn't known to support ID3 tags (unless there is an ID3 tag present).
+ * - the tags of the current file haven't been parsed using the parseTags() method.
  */
 bool MediaFileInfo::id3v1ToId3v2()
 {
-    if(!areTagsSupported() || !m_container) {
+    if(tagsParsingStatus() != ParsingStatus::NotParsedYet && areTagsSupported() && hasId3v1Tag()) {
         return createAppropriateTags(false, TagUsage::Never, TagUsage::Always, true, true, 3);
     } else {
         return false;
@@ -1394,15 +1393,14 @@ bool MediaFileInfo::id3v1ToId3v2()
  *
  * Effectively merges all ID3 tags into a single ID3v1 tag.
  *
- * Does nothing if there are currently no ID3 tags assigned and the file format
- * isn't known to support ID3 tags.
- *
- * This method does nothing the tags of the current file haven't been parsed using
- * the parseTags() method.
+ * \remarks Does nothing if
+ * - there is not at least one ID3v2 tag assigned.
+ * - the file format isn't known to support ID3 tags (unless there is an ID3 tag present).
+ * - the tags of the current file haven't been parsed using the parseTags() method.
  */
 bool MediaFileInfo::id3v2ToId3v1()
 {
-    if(!areTagsSupported() || !m_container) {
+    if(tagsParsingStatus() != ParsingStatus::NotParsedYet && areTagsSupported() && hasId3v2Tag()) {
         return createAppropriateTags(false, TagUsage::Always, TagUsage::Never, true, true, 3);
     } else {
         return false;