diff options
| author | Petr Mrázek <peterix@gmail.com> | 2018-07-24 01:24:06 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2018-07-28 22:12:57 +0200 |
| commit | 9965decd81b8e8ca98d610f605263ccf4ce541e1 (patch) | |
| tree | 48a8402d2d0c6dc27101476ef0e7ca8fb5ff9307 /application/MultiMC.cpp | |
| parent | 9e7cdbfe1183f7124308d4468104d26feb4a017d (diff) | |
| download | MultiMC-9965decd81b8e8ca98d610f605263ccf4ce541e1.tar MultiMC-9965decd81b8e8ca98d610f605263ccf4ce541e1.tar.gz MultiMC-9965decd81b8e8ca98d610f605263ccf4ce541e1.tar.lz MultiMC-9965decd81b8e8ca98d610f605263ccf4ce541e1.tar.xz MultiMC-9965decd81b8e8ca98d610f605263ccf4ce541e1.zip | |
NOISSUE squish.
Diffstat (limited to 'application/MultiMC.cpp')
| -rw-r--r-- | application/MultiMC.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/application/MultiMC.cpp b/application/MultiMC.cpp index 191f52fe..3a9c281e 100644 --- a/application/MultiMC.cpp +++ b/application/MultiMC.cpp @@ -36,7 +36,6 @@ #include "dialogs/CustomMessageBox.h" #include "InstanceList.h" -#include "FolderInstanceProvider.h" #include <minecraft/auth/MojangAccountList.h> #include "icons/IconList.h" @@ -597,10 +596,8 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv) { qWarning() << "Your instance path contains \'!\' and this is known to cause java problems"; } - m_instances.reset(new InstanceList(this)); - m_instanceFolder = new FolderInstanceProvider(m_settings, instDir); - connect(InstDirSetting.get(), &Setting::SettingChanged, m_instanceFolder, &FolderInstanceProvider::on_InstFolderChanged); - m_instances->addInstanceProvider(m_instanceFolder); + m_instances.reset(new InstanceList(m_settings, instDir, this)); + connect(InstDirSetting.get(), &Setting::SettingChanged, m_instances.get(), &InstanceList::on_InstFolderChanged); qDebug() << "Loading Instances..."; m_instances->loadList(); qDebug() << "<> Instances loaded."; |