From 6d438b2ef3ca320d89eb5830024d02610ef8f6d6 Mon Sep 17 00:00:00 2001 From: Sky Date: Sun, 8 Dec 2013 02:58:44 +0000 Subject: Work on new assets system. Working legacy assets importer, disabled assets downloading for now --- gui/MainWindow.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gui') 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() -- cgit v1.2.3