summaryrefslogtreecommitdiffstats
path: root/logic/tools
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-04-01 22:43:18 +0200
committerPetr Mrázek <peterix@gmail.com>2015-04-01 22:43:18 +0200
commit593111b14463e9d5d08256061b981b5ab1cfb710 (patch)
treef2f15e7230d654855e939b02f8cca7048ccbae24 /logic/tools
parent3b6574181e5e0a5d99ed9dcdb5cb9a47af2499d0 (diff)
downloadMultiMC-593111b14463e9d5d08256061b981b5ab1cfb710.tar
MultiMC-593111b14463e9d5d08256061b981b5ab1cfb710.tar.gz
MultiMC-593111b14463e9d5d08256061b981b5ab1cfb710.tar.lz
MultiMC-593111b14463e9d5d08256061b981b5ab1cfb710.tar.xz
MultiMC-593111b14463e9d5d08256061b981b5ab1cfb710.zip
GH-813 Add 'mcedit2.exe' to the list of things the MCEdit tool looks for
Diffstat (limited to 'logic/tools')
-rw-r--r--logic/tools/MCEditTool.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/logic/tools/MCEditTool.cpp b/logic/tools/MCEditTool.cpp
index 1c7d9cd2..e44ce784 100644
--- a/logic/tools/MCEditTool.cpp
+++ b/logic/tools/MCEditTool.cpp
@@ -39,6 +39,10 @@ void MCEditTool::runImpl()
{
program = mceditDir.absoluteFilePath("mcedit.exe");
}
+ else if (mceditDir.exists("mcedit2.exe"))
+ {
+ program = mceditDir.absoluteFilePath("mcedit2.exe");
+ }
QProcess::startDetached(program, QStringList() << save, mceditPath);
#endif
}
@@ -68,7 +72,7 @@ bool MCEditFactory::check(const QString &path, QString *error)
*error = QObject::tr("Path does not exist");
return false;
}
- if (!dir.exists("mcedit.py") && !dir.exists("mcedit.exe") && !dir.exists("Contents"))
+ if (!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");
return false;