diff options
| author | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-01-18 10:11:53 -0700 |
|---|---|---|
| committer | Edgars Cīrulis <edgarsscirulis@gmail.com> | 2023-01-19 09:51:11 +0200 |
| commit | 7ed993b54e20d74c000a29720bc9317ad4849ed0 (patch) | |
| tree | 765e3839288061485ef9b56608736285a8361f34 /launcher/Version.h | |
| parent | 9934537e19c7ce6f9bf926cc8abba023297b0a40 (diff) | |
| download | PrismLauncher-7ed993b54e20d74c000a29720bc9317ad4849ed0.tar.gz PrismLauncher-7ed993b54e20d74c000a29720bc9317ad4849ed0.tar.bz2 PrismLauncher-7ed993b54e20d74c000a29720bc9317ad4849ed0.zip | |
fix: proper null padded version comparison
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Diffstat (limited to 'launcher/Version.h')
| -rw-r--r-- | launcher/Version.h | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/launcher/Version.h b/launcher/Version.h index c0927374..1f1bea83 100644 --- a/launcher/Version.h +++ b/launcher/Version.h @@ -69,6 +69,7 @@ private: explicit Section(const QString &fullString) { m_fullString = fullString; + m_isNull = true; int cutoff = m_fullString.size(); for(int i = 0; i < m_fullString.size(); i++) { @@ -86,6 +87,7 @@ private: if(numPart.size()) { numValid = true; + m_isNull = false; m_numPart = numPart.toInt(); } #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) @@ -95,6 +97,7 @@ private: #endif if(stringPart.size()) { + m_isNull = false; m_stringPart = stringPart.toString(); } } @@ -103,9 +106,17 @@ private: int m_numPart = 0; QString m_stringPart; QString m_fullString; + bool m_isNull; inline bool operator!=(const Section &other) const { + if (m_isNull && other.numValid) { + return 0 != other.m_numPart; + } else if (numValid && other.m_isNull) { + return m_numPart != 0; + } else if (m_isNull || other.m_isNull) { + return false; + } if(numValid && other.numValid) { return m_numPart != other.m_numPart || m_stringPart != other.m_stringPart; @@ -116,7 +127,14 @@ private: } } inline bool operator<(const Section &other) const - { + { + if (m_isNull && other.numValid) { + return 0 < other.m_numPart; + } else if (numValid && other.m_isNull) { + return m_numPart < 0; + } else if (m_isNull || other.m_isNull) { + return true; + } if(numValid && other.numValid) { if(m_numPart < other.m_numPart) @@ -132,6 +150,13 @@ private: } inline bool operator>(const Section &other) const { + if (m_isNull && other.numValid) { + return 0 > other.m_numPart; + } else if (numValid && other.m_isNull) { + return m_numPart > 0; + } else if (m_isNull || other.m_isNull) { + return false; + } if(numValid && other.numValid) { if(m_numPart > other.m_numPart) |