noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1325 from leon-richardt/fix-version-string-windows

Browse source 
[Bug Fix] Fix Version String on Windows
This commit is contained in:
pajlada 2019-09-22 10:37:10 +02:00 committed by GitHub
commit 91f8961f39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/common/Version.cpp
View file

@ -16,11 +16,11 @@ Version::Version()
this->commitHash_ = this->commitHash_ =
QString(FROM_EXTERNAL_DEFINE(CHATTERINO_GIT_HASH)).remove('"'); QString(FROM_EXTERNAL_DEFINE(CHATTERINO_GIT_HASH)).remove('"');
// Date of build // Date of build, this is depended on the format not changing
#ifdef CHATTERINO_NIGHTLY_VERSION_STRING #ifdef CHATTERINO_NIGHTLY_VERSION_STRING
this->dateOfBuild_ = this->dateOfBuild_ =
QString(FROM_EXTERNAL_DEFINE(CHATTERINO_NIGHTLY_VERSION_STRING)) QString(FROM_EXTERNAL_DEFINE(CHATTERINO_NIGHTLY_VERSION_STRING))
.remove('"'); .remove('"').split(' ')[0];
#endif #endif
// "Full" version string, as displayed in window title // "Full" version string, as displayed in window title
@ -31,11 +31,6 @@ Version::Version()
} }
this->fullVersion_ += this->version_; this->fullVersion_ += this->version_;
if (Modes::getInstance().isNightly)
{
this->fullVersion_ += this->dateOfBuild_;
}
} }
const Version &Version::getInstance() const Version &Version::getInstance()