diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-12-08 22:19:58 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-12-08 22:19:58 +0100 |
| commit | 8db2e5db81c91cca9291ca35ed74e632278563e6 (patch) | |
| tree | b4aa9ff8db2561e674e03027b05107a973e4d3a5 /gui | |
| parent | b0dbd4f4afcf60e4021cbb3218bfe280c4989859 (diff) | |
| parent | 2fe27fd0daca14644a2a71456cd60c9a38befbdf (diff) | |
| download | MultiMC-8db2e5db81c91cca9291ca35ed74e632278563e6.tar MultiMC-8db2e5db81c91cca9291ca35ed74e632278563e6.tar.gz MultiMC-8db2e5db81c91cca9291ca35ed74e632278563e6.tar.lz MultiMC-8db2e5db81c91cca9291ca35ed74e632278563e6.tar.xz MultiMC-8db2e5db81c91cca9291ca35ed74e632278563e6.zip | |
Merge branch 'feature_assets' into develop
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/MainWindow.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp index bf2ce6b4..b080f610 100644 --- a/gui/MainWindow.cpp +++ b/gui/MainWindow.cpp @@ -80,6 +80,8 @@ #include "logic/LegacyInstance.h" +#include "logic/assets/AssetsUtils.h" + MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { MultiMCPlatform::fixWM_CLASS(this); @@ -239,7 +241,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi SLOT(assetsFilesProgress(int, int, int))); connect(assets_downloader, SIGNAL(failed()), SLOT(assetsFailed())); connect(assets_downloader, SIGNAL(finished()), SLOT(assetsFinished())); - assets_downloader->start(); + //assets_downloader->start(); } const QString currentInstanceId = MMC->settings()->get("SelectedInstance").toString(); @@ -263,6 +265,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi // removing this looks stupid view->setFocus(); + + AssetsUtils::migrateOldAssets(); } MainWindow::~MainWindow() |