diff options
| author | Sky <git@bunnies.cc> | 2013-12-13 14:58:35 +0000 |
|---|---|---|
| committer | Sky <git@bunnies.cc> | 2013-12-13 14:58:35 +0000 |
| commit | b69351d50d07bab595945d064e4d29b123c19105 (patch) | |
| tree | 5cf6be9ef49ad10a211a0544e5481f36e49a306a /MultiMC.cpp | |
| parent | 979946b7bb2cec808198f9194169ea08cce8bb00 (diff) | |
| parent | 0af6f96c3de54c940799826ff6f3c89bb46f1540 (diff) | |
| download | MultiMC-b69351d50d07bab595945d064e4d29b123c19105.tar MultiMC-b69351d50d07bab595945d064e4d29b123c19105.tar.gz MultiMC-b69351d50d07bab595945d064e4d29b123c19105.tar.lz MultiMC-b69351d50d07bab595945d064e4d29b123c19105.tar.xz MultiMC-b69351d50d07bab595945d064e4d29b123c19105.zip | |
Merge branch 'develop' of github.com:Drayshak/MultiMC5 into develop
Diffstat (limited to 'MultiMC.cpp')
| -rw-r--r-- | MultiMC.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/MultiMC.cpp b/MultiMC.cpp index 6c88a6be..2c9e74dd 100644 --- a/MultiMC.cpp +++ b/MultiMC.cpp @@ -12,7 +12,7 @@ #include "gui/MainWindow.h" #include "gui/dialogs/VersionSelectDialog.h" #include "logic/lists/InstanceList.h" -#include "logic/lists/MojangAccountList.h" +#include "logic/auth/MojangAccountList.h" #include "logic/lists/IconList.h" #include "logic/lists/LwjglVersionList.h" #include "logic/lists/MinecraftVersionList.h" @@ -78,11 +78,13 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv), parser.addShortOpt("quietupdate", 'U'); parser.addDocumentation("quietupdate", "doesn't restart MultiMC after installing updates"); + // WARNING: disabled until further notice + /* // --launch parser.addOption("launch"); parser.addShortOpt("launch", 'l'); parser.addDocumentation("launch", "tries to launch the given instance", "<inst>"); - +*/ // parse the arguments try { @@ -212,6 +214,8 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv), m_qnam.reset(new QNetworkAccessManager(this)); // launch instance, if that's what should be done + // WARNING: disabled until further notice + /* if (!args["launch"].isNull()) { if (InstanceLauncher(args["launch"].toString()).launch()) @@ -220,7 +224,7 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv), m_status = MultiMC::Failed; return; } - +*/ m_status = MultiMC::Initialized; } |