External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-10-04 17:09:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

GH-253 implement launching instances from command line

Browse Source
This commit is contained in:
Petr Mrázek
2015-09-30 00:11:00 +02:00
parent e993b1152d
commit e2fd299fc5
4 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
application/main.cpp
View File

@@ -1,10 +1,11 @@
#include "MultiMC.h"
#include "MainWindow.h"
#include "LaunchInteraction.h"
#include <InstanceList.h>
#include <QDebug>
int main_gui(MultiMC &app)
int launchMainWindow(MultiMC &app)
{
// show main window
app.setIconTheme(MMC->settings()->get("IconTheme").toString());
MainWindow mainWin;
mainWin.restoreState(QByteArray::fromBase64(MMC->settings()->get("MainWindowState").toByteArray()));
mainWin.restoreGeometry(QByteArray::fromBase64(MMC->settings()->get("MainWindowGeometry").toByteArray()));
@@ -13,6 +14,29 @@ int main_gui(MultiMC &app)
mainWin.checkInstancePathForProblems();
return app.exec();
}
int launchInstance(MultiMC &app, InstancePtr inst)
{
app.minecraftlist();
LaunchController launchController;
launchController.setInstance(inst);
launchController.setOnline(true);
launchController.launch();
return app.exec();
}
int main_gui(MultiMC &app)
{
app.setIconTheme(MMC->settings()->get("IconTheme").toString());
// show main window
auto inst = app.instances()->getInstanceById(app.launchId);
if(inst)
{
return launchInstance(app, inst);
}
return launchMainWindow(app);
}
int main(int argc, char *argv[])
{
// initialize Qt