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

Underp and fix some stuff. Works nicer now.

Browse Source
This commit is contained in:
Jan Dalheimer 2014-02-15 15:20:12 +01:00
parent efa8e26a3f
commit 6f6d912d07
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
logic/profiler/JProfiler.cpp
View File

@ -24,8 +24,6 @@ void JProfiler::beginProfilingImpl(MinecraftProcess *process)
{ emit readyToLaunch(tr("Listening on port: %1").arg(port)); }); { emit readyToLaunch(tr("Listening on port: %1").arg(port)); });
connect(profiler, SIGNAL(finished(int)), profiler, SLOT(deleteLater())); connect(profiler, SIGNAL(finished(int)), profiler, SLOT(deleteLater()));
profiler->start(); profiler->start();
QMessageBox::information(0, tr("JProfiler"),
tr("JProfiler started and listening on port %1").arg(port));
} }
void JProfilerFactory::registerSettings(SettingsObject *settings) void JProfilerFactory::registerSettings(SettingsObject *settings)

4
logic/profiler/JVisualVM.cpp
View File

@ -14,9 +14,7 @@ JVisualVM::JVisualVM(OneSixInstance *instance, QObject *parent) : BaseProfiler(i
void JVisualVM::beginProfilingImpl(MinecraftProcess *process) void JVisualVM::beginProfilingImpl(MinecraftProcess *process)
{ {
QProcess *profiler = new QProcess(this); QProcess *profiler = new QProcess(this);
profiler->setArguments(QStringList() << "--jdkhome" profiler->setArguments(QStringList() << "--openpid" << QString::number(process->pid()));
<< m_instance->settings().get("JavaPath").toString()
<< "--openpid" << QString::number(process->pid()));
profiler->setProgram("jvisualvm"); profiler->setProgram("jvisualvm");
connect(profiler, &QProcess::started, [this]() connect(profiler, &QProcess::started, [this]()
{ emit readyToLaunch(tr("JVisualVM started")); }); { emit readyToLaunch(tr("JVisualVM started")); });