summaryrefslogtreecommitdiffstats
path: root/logic
diff options
context:
space:
mode:
authorJan Dalheimer <jan@dalheimer.de>2014-02-15 15:20:12 +0100
committerJan Dalheimer <jan@dalheimer.de>2014-02-15 15:20:12 +0100
commit6f6d912d07901efebf5f399ee94c458acdc1369b (patch)
treebaf1102c7fc254e706d1e1d764ed68cbe220f9c0 /logic
parentefa8e26a3f3f7ba5e536cd10e86303b4fe1baba0 (diff)
downloadMultiMC-6f6d912d07901efebf5f399ee94c458acdc1369b.tar
MultiMC-6f6d912d07901efebf5f399ee94c458acdc1369b.tar.gz
MultiMC-6f6d912d07901efebf5f399ee94c458acdc1369b.tar.lz
MultiMC-6f6d912d07901efebf5f399ee94c458acdc1369b.tar.xz
MultiMC-6f6d912d07901efebf5f399ee94c458acdc1369b.zip
Underp and fix some stuff. Works nicer now.
Diffstat (limited to 'logic')
-rw-r--r--logic/profiler/JProfiler.cpp2
-rw-r--r--logic/profiler/JVisualVM.cpp4
2 files changed, 1 insertions, 5 deletions
diff --git a/logic/profiler/JProfiler.cpp b/logic/profiler/JProfiler.cpp
index b9cf19a0..aa6a866a 100644
--- a/logic/profiler/JProfiler.cpp
+++ b/logic/profiler/JProfiler.cpp
@@ -24,8 +24,6 @@ void JProfiler::beginProfilingImpl(MinecraftProcess *process)
{ emit readyToLaunch(tr("Listening on port: %1").arg(port)); });
connect(profiler, SIGNAL(finished(int)), profiler, SLOT(deleteLater()));
profiler->start();
- QMessageBox::information(0, tr("JProfiler"),
- tr("JProfiler started and listening on port %1").arg(port));
}
void JProfilerFactory::registerSettings(SettingsObject *settings)
diff --git a/logic/profiler/JVisualVM.cpp b/logic/profiler/JVisualVM.cpp
index 31cc51b1..ef46890a 100644
--- a/logic/profiler/JVisualVM.cpp
+++ b/logic/profiler/JVisualVM.cpp
@@ -14,9 +14,7 @@ JVisualVM::JVisualVM(OneSixInstance *instance, QObject *parent) : BaseProfiler(i
void JVisualVM::beginProfilingImpl(MinecraftProcess *process)
{
QProcess *profiler = new QProcess(this);
- profiler->setArguments(QStringList() << "--jdkhome"
- << m_instance->settings().get("JavaPath").toString()
- << "--openpid" << QString::number(process->pid()));
+ profiler->setArguments(QStringList() << "--openpid" << QString::number(process->pid()));
profiler->setProgram("jvisualvm");
connect(profiler, &QProcess::started, [this]()
{ emit readyToLaunch(tr("JVisualVM started")); });