summaryrefslogtreecommitdiffstats
path: root/application/MainWindow.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2017-03-12 19:45:28 +0100
committerPetr Mrázek <peterix@gmail.com>2017-04-07 00:20:01 +0200
commit2980322c3b34b252ead838daee7a844853feccf6 (patch)
tree4eba831705c497075d30391423a167ebc1c136fc /application/MainWindow.cpp
parent8321187a20eec9871f327aa23f421e79dcfdd409 (diff)
downloadMultiMC-2980322c3b34b252ead838daee7a844853feccf6.tar
MultiMC-2980322c3b34b252ead838daee7a844853feccf6.tar.gz
MultiMC-2980322c3b34b252ead838daee7a844853feccf6.tar.lz
MultiMC-2980322c3b34b252ead838daee7a844853feccf6.tar.xz
MultiMC-2980322c3b34b252ead838daee7a844853feccf6.zip
NOISSUE Remove Minecraft version list and versions.
Diffstat (limited to 'application/MainWindow.cpp')
-rw-r--r--application/MainWindow.cpp17
1 files changed, 2 insertions, 15 deletions
diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp
index 3bdf540d..9073c006 100644
--- a/application/MainWindow.cpp
+++ b/application/MainWindow.cpp
@@ -54,7 +54,6 @@
#include <java/JavaUtils.h>
#include <java/JavaInstallList.h>
#include <launch/LaunchTask.h>
-#include <minecraft/MinecraftVersionList.h>
#include <minecraft/legacy/LwjglVersionList.h>
#include <minecraft/auth/MojangAccountList.h>
#include <SkinUtils.h>
@@ -558,6 +557,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new MainWindow
// run the things that load and download other things... FIXME: this is NOT the place
// FIXME: invisible actions in the background = NOPE.
{
+ /*
if (!MMC->minecraftlist()->isLoaded())
{
m_versionLoadTask = MMC->minecraftlist()->getLoadTask();
@@ -567,6 +567,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new MainWindow
{
MMC->lwjgllist()->loadList();
}
+ */
m_newsChecker->reloadNews();
updateNewsLabel();
@@ -1014,18 +1015,6 @@ void MainWindow::setCatBackground(bool enabled)
}
}
-// FIXME: eliminate, should not be needed
-void MainWindow::waitForMinecraftVersions()
-{
- if (!MMC->minecraftlist()->isLoaded() && m_versionLoadTask && m_versionLoadTask->isRunning())
- {
- QEventLoop waitLoop;
- waitLoop.connect(m_versionLoadTask, &Task::failed, &waitLoop, &QEventLoop::quit);
- waitLoop.connect(m_versionLoadTask, &Task::succeeded, &waitLoop, &QEventLoop::quit);
- waitLoop.exec();
- }
-}
-
void MainWindow::runModalTask(Task *task)
{
connect(task, &Task::failed, [this](QString reason)
@@ -1117,8 +1106,6 @@ void MainWindow::on_actionAddInstance_triggered()
groupName = map["group"].toString();
} while(0);
- waitForMinecraftVersions();
-
if(groupName.isEmpty())
{
groupName = MMC->settings()->get("LastUsedGroupForNewInstance").toString();