diff options
| author | Sky <git@bunnies.cc> | 2013-12-08 02:58:44 +0000 |
|---|---|---|
| committer | Sky <git@bunnies.cc> | 2013-12-08 02:58:44 +0000 |
| commit | 6d438b2ef3ca320d89eb5830024d02610ef8f6d6 (patch) | |
| tree | 904ea129e0f5558dadcf1ef1928128d72e283398 /gui/MainWindow.cpp | |
| parent | 613699b3626aea750093ab7eaaeccaa28c0e87c6 (diff) | |
| download | MultiMC-6d438b2ef3ca320d89eb5830024d02610ef8f6d6.tar MultiMC-6d438b2ef3ca320d89eb5830024d02610ef8f6d6.tar.gz MultiMC-6d438b2ef3ca320d89eb5830024d02610ef8f6d6.tar.lz MultiMC-6d438b2ef3ca320d89eb5830024d02610ef8f6d6.tar.xz MultiMC-6d438b2ef3ca320d89eb5830024d02610ef8f6d6.zip | |
Work on new assets system. Working legacy assets importer, disabled assets downloading for now
Diffstat (limited to 'gui/MainWindow.cpp')
| -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 854091c6..26e7b27b 100644 --- a/gui/MainWindow.cpp +++ b/gui/MainWindow.cpp @@ -84,6 +84,8 @@ #include "logic/LegacyInstance.h" +#include "logic/assets/AssetsUtils.h" + MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { MultiMCPlatform::fixWM_CLASS(this); @@ -243,7 +245,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(); @@ -267,6 +269,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi // removing this looks stupid view->setFocus(); + + AssetsUtils::migrateOldAssets(); } MainWindow::~MainWindow() |