summaryrefslogtreecommitdiffstats
path: root/gui/MainWindow.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-04-05 22:58:47 +0200
committerPetr Mrázek <peterix@gmail.com>2014-04-06 00:33:33 +0200
commit42e305bb9d1babef9bb66a8d376289e8aebed671 (patch)
tree7cad2b473abc703d3c9f29daee7f5560d6e22e76 /gui/MainWindow.cpp
parentad9d082f5713df72fc18de957547b7ad47a60e46 (diff)
downloadMultiMC-42e305bb9d1babef9bb66a8d376289e8aebed671.tar
MultiMC-42e305bb9d1babef9bb66a8d376289e8aebed671.tar.gz
MultiMC-42e305bb9d1babef9bb66a8d376289e8aebed671.tar.lz
MultiMC-42e305bb9d1babef9bb66a8d376289e8aebed671.tar.xz
MultiMC-42e305bb9d1babef9bb66a8d376289e8aebed671.zip
Get rid of long rebuilds because of minor cmake config changes
Diffstat (limited to 'gui/MainWindow.cpp')
-rw-r--r--gui/MainWindow.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp
index 480ee3b1..e4d28ca3 100644
--- a/gui/MainWindow.cpp
+++ b/gui/MainWindow.cpp
@@ -17,6 +17,7 @@
* limitations under the License.
*/
#include "MultiMC.h"
+#include "Config.h"
#include "MainWindow.h"
#include "ui_MainWindow.h"
@@ -107,9 +108,9 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
MultiMCPlatform::fixWM_CLASS(this);
ui->setupUi(this);
- QString winTitle = QString("MultiMC 5 - Version %1").arg(MMC->version().toString());
- if (!MMC->version().platform.isEmpty())
- winTitle += " on " + MMC->version().platform;
+ QString winTitle = QString("MultiMC 5 - Version %1").arg(BuildConfig.printableVersionString());
+ if (!BuildConfig.BUILD_PLATFORM.isEmpty())
+ winTitle += " on " + BuildConfig.BUILD_PLATFORM;
setWindowTitle(winTitle);
// OSX magic.
@@ -709,9 +710,8 @@ void MainWindow::downloadUpdates(QString repo, int versionId, bool installOnExit
if (updateDlg.exec(&updateTask))
{
UpdateFlags baseFlags = None;
-#ifdef MultiMC_UPDATER_DRY_RUN
- baseFlags |= DryRun;
-#endif
+ if(BuildConfig.UPDATER_DRY_RUN)
+ baseFlags |= DryRun;
if (installOnExit)
MMC->installUpdates(updateTask.updateFilesDir(), baseFlags | OnExit);
else