From c14e54c8303ff631ba922b38b195302744fe02c6 Mon Sep 17 00:00:00 2001 From: Christian Hohnstaedt Date: Sun, 4 Mar 2018 17:42:32 +0100 Subject: [PATCH] Minor fixes: Date from database and affected items Correctly initialize undefined date from database Clear list of affected items after commit. --- lib/asn1time.cpp | 9 ++++----- lib/sql.cpp | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/asn1time.cpp b/lib/asn1time.cpp index 1467a3fd..96118acd 100644 --- a/lib/asn1time.cpp +++ b/lib/asn1time.cpp @@ -47,17 +47,16 @@ int a1time::from_asn1(const ASN1_TIME *a) return -1; t = QString::fromLatin1((char*)gt->data, gt->length); ASN1_GENERALIZEDTIME_free(gt); - if (t == UNDEFINED_DATE) { - setUndefined(); - return 0; - } return fromPlain(t); } int a1time::fromPlain(QString plain) { - *this = QDateTime::fromString(plain, GEN_FORMAT); setTimeSpec(Qt::UTC); + if (plain == UNDEFINED_DATE) + setUndefined(); + else + *this = fromString(plain, GEN_FORMAT); return isValid() ? 0 : -1; } diff --git a/lib/sql.cpp b/lib/sql.cpp index 0caf3efb..731a68b5 100644 --- a/lib/sql.cpp +++ b/lib/sql.cpp @@ -79,6 +79,7 @@ bool DbTransaction::finish(const char *oper, const char *file, int line) q.exec(); } mutex--; + items.clear(); return db.commit(); }