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

Fix #220: Use .exe suffix on windows for jprofiler

Browse Source
This commit is contained in:
Jan Dalheimer 2014-11-02 20:16:29 +01:00
parent d9b2f0ed42
commit add23a9a0b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
logic/tools/JProfiler.cpp
View File

@ -19,7 +19,11 @@ void JProfiler::beginProfilingImpl(MinecraftProcess *process)
profiler->setArguments(QStringList() << "-d" << QString::number(pid(process)) << "--gui" profiler->setArguments(QStringList() << "-d" << QString::number(pid(process)) << "--gui"
<< "-p" << QString::number(port)); << "-p" << QString::number(port));
profiler->setProgram(QDir(MMC->settings()->get("JProfilerPath").toString()) profiler->setProgram(QDir(MMC->settings()->get("JProfilerPath").toString())
#ifdef Q_OS_WIN
.absoluteFilePath("bin/jpenable.exe"));
#else
.absoluteFilePath("bin/jpenable")); .absoluteFilePath("bin/jpenable"));
#endif
connect(profiler, &QProcess::started, [this, port]() connect(profiler, &QProcess::started, [this, port]()
{ emit readyToLaunch(tr("Listening on port: %1").arg(port)); }); { emit readyToLaunch(tr("Listening on port: %1").arg(port)); });
connect(profiler, connect(profiler,
@ -69,7 +73,7 @@ bool JProfilerFactory::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("bin") || !dir.exists("bin/jprofiler") || !dir.exists("bin/agent.jar")) if (!dir.exists("bin") || !(dir.exists("bin/jprofiler") || dir.exists("bin/jprofiler.exe")) || !dir.exists("bin/agent.jar"))
{ {
*error = QObject::tr("Invalid JProfiler install"); *error = QObject::tr("Invalid JProfiler install");
return false; return false;