Merge pull request #53 from LightZam/issue#52

fix issue#52

1 files changed, 9 insertions, 5 deletions

diff --git a/src/base/QXmppMessage.cpp b/src/base/QXmppMessage.cpp
index 43675d9b..0ee4be20 100644
--- a/src/base/QXmppMessage.cpp
+++ b/src/base/QXmppMessage.cpp
@@ -553,11 +553,15 @@ void QXmppMessage::parse(const QDomElement &element)
         {
             if (xElement.namespaceURI() == ns_legacy_delayed_delivery)
             {
-                // XEP-0091: Legacy Delayed Delivery
-                const QString str = xElement.attribute("stamp");
-                d->stamp = QDateTime::fromString(str, "yyyyMMddThh:mm:ss");
-                d->stamp.setTimeSpec(Qt::UTC);
-                d->stampType = LegacyDelayedDelivery;
+                // if XEP-0203 exists, XEP-0091 has no need to parse because XEP-0091 is no more standard protocol)
+                if (d->stamp.isNull())
+                {
+                    // XEP-0091: Legacy Delayed Delivery
+                    const QString str = xElement.attribute("stamp");
+                    d->stamp = QDateTime::fromString(str, "yyyyMMddThh:mm:ss");
+                    d->stamp.setTimeSpec(Qt::UTC);
+                    d->stampType = LegacyDelayedDelivery;
+                }
             } else if (xElement.namespaceURI() == ns_conference) {
                 // XEP-0249: Direct MUC Invitations
                 d->mucInvitationJid = xElement.attribute("jid");