Include empty messages as they may be used

Used by messages that have their text in Eventmsg.txt
bvschaik · Oct 27, 2017 · bfc0af2 · bfc0af2
1 parent c448112
commit bfc0af2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/engconverter/src/messageentry.cpp b/engconverter/src/messageentry.cpp
@@ -102,6 +102,9 @@ bool MessageEntry::isEmpty() const
     if (!m_image.isEmpty() || !m_image2.isEmpty()) {
         return false;
     }
+    if (m_dialog.x || m_dialog.y || m_dialog.width || m_dialog.height) {
+        return false;
+    }
     return m_title.isEmpty() && m_subtitle.isEmpty() && m_video.isEmpty() && m_content.isEmpty();
 }
 

diff --git a/engconverter/src/messagefilexmlstream.cpp b/engconverter/src/messagefilexmlstream.cpp
@@ -87,14 +87,7 @@ bool MessageFileXmlStream::readMessageEntry(MessageFile &file, QXmlStreamReader
     }
     readCloseTag(xml, "dialog", logger);
 
-    if (!readNextOpenTag(xml, logger)) {
-        logger.error(QString("Unexpected end of message %1, "
-            "expected at least one of the following tags: "
-            "image, title, subtitle, video, content").arg(id));
-        return false;
-    }
-
-    do {
+    while (readNextOpenTag(xml, logger)) {
         const QString &tag = xml.name().toString();
         if (tag == "image" || tag == "image2") {
             MessageEntry::Image &image = tag == "image" ? entry.image() : entry.image2();
@@ -119,7 +112,7 @@ bool MessageFileXmlStream::readMessageEntry(MessageFile &file, QXmlStreamReader
         if (!readCloseTag(xml, tag, logger)) {
             return false;
         }
-    } while (readNextOpenTag(xml, logger));
+    };
 
     file.m_entries.append(entry);
     return true;