diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-01-12 22:34:53 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-01-12 22:34:53 +0100 |
| commit | f552366e03cd6bd693850e24503bf3bf3559cfd0 (patch) | |
| tree | 7ac1fc527254522d4f1d6308ccc64f3b5e85843b /MultiMC.cpp | |
| parent | b589a12d1765f8df616779c53e614adef2e4c48e (diff) | |
| parent | 398167e8b01732badaa2c757b1547e879a369945 (diff) | |
| download | PrismLauncher-f552366e03cd6bd693850e24503bf3bf3559cfd0.tar.gz PrismLauncher-f552366e03cd6bd693850e24503bf3bf3559cfd0.tar.bz2 PrismLauncher-f552366e03cd6bd693850e24503bf3bf3559cfd0.zip | |
Merge branch 'feature_mojang_status' into develop
Diffstat (limited to 'MultiMC.cpp')
| -rw-r--r-- | MultiMC.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MultiMC.cpp b/MultiMC.cpp index 17fc2e0a..819091cd 100644 --- a/MultiMC.cpp +++ b/MultiMC.cpp @@ -20,8 +20,11 @@ #include "logic/news/NewsChecker.h" +#include "logic/status/StatusChecker.h" + #include "logic/InstanceLauncher.h" #include "logic/net/HttpMetaCache.h" +#include "logic/net/URLConstants.h" #include "logic/JavaUtils.h" @@ -181,6 +184,9 @@ MultiMC::MultiMC(int &argc, char **argv, bool root_override) // initialize the news checker m_newsChecker.reset(new NewsChecker(NEWS_RSS_URL)); + // initialize the status checker + m_statusChecker.reset(new StatusChecker()); + // and instances auto InstDirSetting = m_settings->getSetting("InstanceDir"); m_instances.reset(new InstanceList(InstDirSetting->get().toString(), this)); |