summaryrefslogtreecommitdiffstats
path: root/gui/mainwindow.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-09-16 00:54:39 +0200
committerPetr Mrázek <peterix@gmail.com>2013-09-16 00:54:39 +0200
commitd38b90530b3ba3a49c4eb072eb344ae2b0836913 (patch)
tree5dd07e59ae1bc8392a773ec8fec6b6a3aa7e4840 /gui/mainwindow.cpp
parent7721c57e5e1093a3d8597b6b6f30c97d2aa3d8a5 (diff)
downloadMultiMC-d38b90530b3ba3a49c4eb072eb344ae2b0836913.tar
MultiMC-d38b90530b3ba3a49c4eb072eb344ae2b0836913.tar.gz
MultiMC-d38b90530b3ba3a49c4eb072eb344ae2b0836913.tar.lz
MultiMC-d38b90530b3ba3a49c4eb072eb344ae2b0836913.tar.xz
MultiMC-d38b90530b3ba3a49c4eb072eb344ae2b0836913.zip
Forge version list implementation. Needs integration and testing.
Diffstat (limited to 'gui/mainwindow.cpp')
-rw-r--r--gui/mainwindow.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 747df047..241df383 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -154,14 +154,14 @@ MainWindow::MainWindow ( QWidget *parent )
// run the things that load and download other things... FIXME: this is NOT the place
// FIXME: invisible actions in the background = NOPE.
{
- if (!MinecraftVersionList::getMainList().isLoaded())
+ if (!MMC->minecraftlist()->isLoaded())
{
- m_versionLoadTask = MinecraftVersionList::getMainList().getLoadTask();
+ m_versionLoadTask = MMC->minecraftlist()->getLoadTask();
startTask(m_versionLoadTask);
}
- if (!LWJGLVersionList::get().isLoaded())
+ if (!MMC->lwjgllist()->isLoaded())
{
- LWJGLVersionList::get().loadList();
+ MMC->lwjgllist()->loadList();
}
assets_downloader = new OneSixAssets();
assets_downloader->start();
@@ -245,7 +245,7 @@ void MainWindow::instanceActivated ( QModelIndex index )
void MainWindow::on_actionAddInstance_triggered()
{
- if (!MinecraftVersionList::getMainList().isLoaded() &&
+ if (!MMC->minecraftlist()->isLoaded() &&
m_versionLoadTask && m_versionLoadTask->isRunning())
{
QEventLoop waitLoop;
@@ -604,7 +604,7 @@ void MainWindow::on_actionChangeInstMCVersion_triggered()
VersionSelectDialog vselect(m_selectedInstance->versionList(), this);
if (vselect.exec() && vselect.selectedVersion())
{
- m_selectedInstance->setIntendedVersionId(vselect.selectedVersion()->descriptor);
+ m_selectedInstance->setIntendedVersionId(vselect.selectedVersion()->descriptor());
}
}