Merge https://github.com/Drayshak/MultiMC5 into develop

1 files changed, 24 insertions, 2 deletions

diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp
index 9cb79ea3..42470bb0 100644
--- a/gui/MainWindow.cpp
+++ b/gui/MainWindow.cpp
@@ -88,6 +88,7 @@
 #include "logic/LegacyInstance.h"
 
 #include "logic/assets/AssetsUtils.h"
+#include "logic/assets/AssetsMigrateTask.h"
 #include <logic/updater/UpdateChecker.h>
 
 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow)
@@ -286,8 +287,6 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
 
 	// removing this looks stupid
 	view->setFocus();
-
-	AssetsUtils::migrateOldAssets();
 }
 
 MainWindow::~MainWindow()
@@ -1163,6 +1162,29 @@ void MainWindow::instanceEnded()
 	this->show();
 }
 
+void MainWindow::checkMigrateLegacyAssets()
+{
+	int legacyAssets = AssetsUtils::findLegacyAssets();
+	if(legacyAssets > 0)
+	{
+		ProgressDialog migrateDlg(this);
+		AssetsMigrateTask migrateTask(legacyAssets, &migrateDlg);
+
+		if (migrateDlg.exec(&migrateTask))
+		{
+			QLOG_INFO() << "Assets migration task completed successfully";
+		}
+		else
+		{
+			QLOG_INFO() << "Assets migration task reported failure";
+		}
+	}
+	else
+	{
+		QLOG_INFO() << "Didn't find any legacy assets to migrate";
+	}
+}
+
 void MainWindow::checkSetDefaultJava()
 {
 	bool askForJava = false;