mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2024-12-29 09:15:49 +00:00
Code Issues Projects Releases Wiki Activity

NOISSUE ifdef the hell out of MCEdit launch on Windows

Browse Source 
Setting the work directory was not enough.
This commit is contained in:
Petr Mrázek 2016-11-03 02:41:01 +01:00
parent f4de049b13
commit 6ebf6e7785
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
application/pages/WorldListPage.cpp
View File

@ -172,12 +172,19 @@ void WorldListPage::on_mcEditBtn_clicked()
auto program = mcedit->getProgramPath();
if(program.size())
{
#ifdef Q_OS_WIN32
if(!QProcess::startDetached(program, {fullPath}, mceditPath))
{
mceditError();
}
#else
m_mceditProcess.reset(new LoggedProcess());
m_mceditProcess->setDetachable(true);
connect(m_mceditProcess.get(), &LoggedProcess::stateChanged, this, &WorldListPage::mceditState);
m_mceditProcess->start(program, {fullPath});
m_mceditProcess->setWorkingDirectory(mceditPath);
m_mceditStarting = true;
#endif
}
else
{
@ -189,6 +196,15 @@ void WorldListPage::on_mcEditBtn_clicked()
}
}
void WorldListPage::mceditError()
{
QMessageBox::warning(
this->parentWidget(),
tr("MCEdit failed to start!"),
tr("MCEdit failed to start.\nIt may be necessary to reinstall it.")
);
}
void WorldListPage::mceditState(LoggedProcess::State state)
{
bool failed = false;
@ -212,11 +228,7 @@ void WorldListPage::mceditState(LoggedProcess::State state)
}
if(failed)
{
QMessageBox::warning(
this->parentWidget(),
tr("MCEdit failed to start!"),
tr("MCEdit failed to start.\nIt may be necessary to reinstall it.")
);
mceditError();
}
}

1
application/pages/WorldListPage.h
View File

@ -70,6 +70,7 @@ private:
QModelIndex getSelectedWorld();
bool isWorldSafe(QModelIndex index);
bool worldSafetyNagQuestion();
void mceditError();
private:
Ui::WorldListPage *ui;