External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-12-24 04:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

NOISSUE use LoggedProcess to work around issues with QProcess on macOS

Browse Source
This commit is contained in:
Petr Mrázek
2016-11-03 01:10:16 +01:00
parent ac66af6c13
commit f0b71f989e
17 changed files with 62 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
application/pages/WorldListPage.cpp
View File

@@ -29,6 +29,7 @@
#include "MultiMC.h"
#include <GuiUtil.h>
#include <QProcess>
#include <FileSystem.h>
WorldListPage::WorldListPage(BaseInstance *inst, std::shared_ptr<WorldList> worlds, QString id,
QString iconName, QString displayName, QString helpPage,
@@ -149,7 +150,11 @@ void WorldListPage::on_copySeedBtn_clicked()
void WorldListPage::on_mcEditBtn_clicked()
{
if(m_mceditStarting)
return;
auto mcedit = MMC->mcedit();
const QString mceditPath = mcedit->path();
QModelIndex index = getSelectedWorld();
@@ -167,15 +172,11 @@ void WorldListPage::on_mcEditBtn_clicked()
auto program = mcedit->getProgramPath();
if(program.size())
{
qint64 pid;
if(!QProcess::startDetached(program, QStringList() << fullPath, mceditPath, &pid))
{
QMessageBox::warning(
this->parentWidget(),
tr("MCEdit failed to start!"),
tr("MCEdit failed to start.\nIt may be necessary to reinstall it.")
);
}
m_mceditProcess.reset(new LoggedProcess());
m_mceditProcess->setDetachable(true);
connect(m_mceditProcess.get(), &LoggedProcess::stateChanged, this, &WorldListPage::mceditState);
m_mceditProcess->start(program, {fullPath});
m_mceditStarting = true;
}
else
{
@@ -187,6 +188,37 @@ void WorldListPage::on_mcEditBtn_clicked()
}
}
void WorldListPage::mceditState(LoggedProcess::State state)
{
bool failed = false;
switch(state)
{
case LoggedProcess::NotRunning:
case LoggedProcess::Starting:
return;
case LoggedProcess::FailedToStart:
case LoggedProcess::Crashed:
case LoggedProcess::Aborted:
{
failed = true;
}
case LoggedProcess::Running:
case LoggedProcess::Finished:
{
m_mceditStarting = false;
break;
}
}
if(failed)
{
QMessageBox::warning(
this->parentWidget(),
tr("MCEdit failed to start!"),
tr("MCEdit failed to start.\nIt may be necessary to reinstall it.")
);
}
}
void WorldListPage::worldChanged(const QModelIndex &current, const QModelIndex &previous)
{
QModelIndex index = getSelectedWorld();