0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-1009 add mcedit.pyc as a valid mcedit 'executable'

Browse Source
This commit is contained in:
Petr Mrázek 2015-06-10 23:51:05 +02:00
parent dd97ea8029
commit 1feb4bb387
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
logic/tools/MCEditTool.cpp
View File

@ -63,11 +63,17 @@ void MCEditTool::runImpl()
#else #else
QDir mceditDir(mceditPath); QDir mceditDir(mceditPath);
QString program; QString program;
#ifdef Q_OS_LINUX
if (mceditDir.exists("mcedit.py")) if (mceditDir.exists("mcedit.py"))
{ {
program = mceditDir.absoluteFilePath("mcedit.py"); program = mceditDir.absoluteFilePath("mcedit.py");
} }
else if (mceditDir.exists("mcedit.exe")) else if (mceditDir.exists("mcedit.pyc"))
{
program = mceditDir.absoluteFilePath("mcedit.pyc");
}
#elif defined(Q_OS_WIN32)
if (mceditDir.exists("mcedit.exe"))
{ {
program = mceditDir.absoluteFilePath("mcedit.exe"); program = mceditDir.absoluteFilePath("mcedit.exe");
} }
@ -75,7 +81,11 @@ void MCEditTool::runImpl()
{ {
program = mceditDir.absoluteFilePath("mcedit2.exe"); program = mceditDir.absoluteFilePath("mcedit2.exe");
} }
QProcess::startDetached(program, QStringList() << save, mceditPath); #endif
if(program.size())
{
QProcess::startDetached(program, QStringList() << save, mceditPath);
}
#endif #endif
} }
@ -105,7 +115,7 @@ bool MCEditFactory::check(const QString &path, QString *error)
*error = QObject::tr("Path does not exist"); *error = QObject::tr("Path does not exist");
return false; return false;
} }
if (!dir.exists("mcedit.py") && !dir.exists("mcedit.exe") && !dir.exists("Contents") && !dir.exists("mcedit2.exe")) if (!dir.exists("mcedit.pyc") && !dir.exists("mcedit.py") && !dir.exists("mcedit.exe") && !dir.exists("Contents") && !dir.exists("mcedit2.exe"))
{ {
*error = QObject::tr("Path does not seem to be a MCEdit path"); *error = QObject::tr("Path does not seem to be a MCEdit path");
return false; return false;