diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-12-28 04:45:49 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-12-28 05:36:17 +0100 |
| commit | 5402acb3c6cf9b63c9df69ee463cae02259dfdef (patch) | |
| tree | 76bbfd58704b3634fe6a707c6ec13a5dccb267ea /application/MultiMC.cpp | |
| parent | e8063d193d56acc10c5a533cffd95c9271b24e65 (diff) | |
| download | PrismLauncher-5402acb3c6cf9b63c9df69ee463cae02259dfdef.tar.gz PrismLauncher-5402acb3c6cf9b63c9df69ee463cae02259dfdef.tar.bz2 PrismLauncher-5402acb3c6cf9b63c9df69ee463cae02259dfdef.zip | |
GH-1360 add basic changelog based on github API, fix update dialog buttons
Diffstat (limited to 'application/MultiMC.cpp')
| -rw-r--r-- | application/MultiMC.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/application/MultiMC.cpp b/application/MultiMC.cpp index 1c1fe835..cd5e145a 100644 --- a/application/MultiMC.cpp +++ b/application/MultiMC.cpp @@ -116,7 +116,7 @@ MultiMC::MultiMC(int &argc, char **argv, bool test_mode) : QApplication(argc, ar // display version and exit if (args["version"].toBool()) { - std::cout << "Version " << BuildConfig.VERSION_STR.toStdString() << std::endl; + std::cout << "Version " << BuildConfig.printableVersionString().toStdString() << std::endl; std::cout << "Git " << BuildConfig.GIT_COMMIT.toStdString() << std::endl; m_status = MultiMC::Succeeded; return; @@ -175,8 +175,9 @@ MultiMC::MultiMC(int &argc, char **argv, bool test_mode) : QApplication(argc, ar initLogger(); qDebug() << "MultiMC 5, (c) 2013-2015 MultiMC Contributors"; - qDebug() << "Version : " << BuildConfig.VERSION_STR; + qDebug() << "Version : " << BuildConfig.printableVersionString(); qDebug() << "Git commit : " << BuildConfig.GIT_COMMIT; + qDebug() << "Git refspec : " << BuildConfig.GIT_REFSPEC; if (adjustedBy.size()) { qDebug() << "Work dir before adjustment : " << origcwdPath; @@ -197,7 +198,10 @@ MultiMC::MultiMC(int &argc, char **argv, bool test_mode) : QApplication(argc, ar initTranslations(); // initialize the updater - m_updateChecker.reset(new UpdateChecker(BuildConfig.CHANLIST_URL, BuildConfig.VERSION_CHANNEL, BuildConfig.VERSION_BUILD)); + if(BuildConfig.UPDATER_ENABLED) + { + m_updateChecker.reset(new UpdateChecker(BuildConfig.CHANLIST_URL, BuildConfig.VERSION_CHANNEL, BuildConfig.VERSION_BUILD)); + } m_translationChecker.reset(new TranslationDownloader()); |