diff --git a/src/lib_license/License.cpp b/src/lib_license/License.cpp index 174f177b..02fac8fb 100644 --- a/src/lib_license/License.cpp +++ b/src/lib_license/License.cpp @@ -432,7 +432,7 @@ bool License::isExpired() const else { Version version = Version::fromString(m_expire); - return Version::getApplicationVersion() > version; + return Version::getApplicationVersion().toShortVersion() > version; } } diff --git a/src/lib_license/utility/Version.cpp b/src/lib_license/utility/Version.cpp index ce5c23cc..55162c3a 100644 --- a/src/lib_license/utility/Version.cpp +++ b/src/lib_license/utility/Version.cpp @@ -95,6 +95,11 @@ bool Version::isValid() const return (0 < m_minorNumber && m_minorNumber < 5 && m_year > 2016); } +Version Version::toShortVersion() const +{ + return Version(m_year, m_minorNumber); +} + std::string Version::toShortString() const { std::stringstream ss; diff --git a/src/lib_license/utility/Version.h b/src/lib_license/utility/Version.h index 5198fc08..db67ea7c 100644 --- a/src/lib_license/utility/Version.h +++ b/src/lib_license/utility/Version.h @@ -16,6 +16,8 @@ public: bool isEmpty() const; bool isValid() const; + Version toShortVersion() const; + std::string toString() const; std::string toShortString() const; std::string toDisplayString() const;