dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/Stiepen22/MultiMC5 into develop

Browse source 
Conflicts:
	AppSettings.cpp
	MultiMC.pro
	main.cpp
This commit is contained in:
Petr Mrázek 2013-09-08 16:21:49 +02:00
commit 499ee1e365
8 changed files with 119 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

25
gui/mainwindow.cpp
View file

@ -488,7 +488,10 @@ void MainWindow::doLogin(const QString& errorMsg)
}
else
{
m_activeLogin = {loginDlg->getUsername(), QString("Offline"), qint64(-1)};
QString user = loginDlg->getUsername();
if (user.length() == 0)
user = QString("Offline");
m_activeLogin = {user, QString("Offline"), qint64(-1)};
m_activeInst = m_selectedInstance;
launchInstance(m_activeInst, m_activeLogin);
}
@ -534,10 +537,22 @@ void MainWindow::launchInstance(BaseInstance *instance, LoginResponse response)
if(!proc)
return;
console = new ConsoleWindow();
// Prepare GUI: If it shall stay open disable the required parts
if (MMC->settings()->get("NoHide").toBool())
{
ui->actionLaunchInstance->setEnabled(false);
}
else
{
this->hide();
}
console = new ConsoleWindow(proc);
console->show();
connect(proc, SIGNAL(log(QString, MessageLevel::Enum)),
console, SLOT(write(QString, MessageLevel::Enum)));
connect(proc, SIGNAL(ended()), this, SLOT(instanceEnded()));
proc->setLogin(m_activeLogin.username, m_activeLogin.sessionID);
proc->launch();
}
@ -664,3 +679,9 @@ void MainWindow::on_actionEditInstNotes_triggered()
linst->setNotes(noteedit.getText());
}
}
void MainWindow::instanceEnded()
{
this->show();
ui->actionLaunchInstance->setEnabled(m_selectedInstance);
}