summaryrefslogtreecommitdiffstats
path: root/logic
diff options
context:
space:
mode:
authorJan Dalheimer <jan@dalheimer.de>2014-02-16 12:00:38 +0100
committerJan Dalheimer <jan@dalheimer.de>2014-02-16 12:00:38 +0100
commitc608841f770729a22e38cb4df8c3555062ac04dc (patch)
tree62197280cc42089b54541e4e2fd06e544f3dec77 /logic
parent2e64d0308c96b18532918d36794368eb1deb24cd (diff)
downloadMultiMC-c608841f770729a22e38cb4df8c3555062ac04dc.tar
MultiMC-c608841f770729a22e38cb4df8c3555062ac04dc.tar.gz
MultiMC-c608841f770729a22e38cb4df8c3555062ac04dc.tar.lz
MultiMC-c608841f770729a22e38cb4df8c3555062ac04dc.tar.xz
MultiMC-c608841f770729a22e38cb4df8c3555062ac04dc.zip
Attempt to find jvisualvm
Diffstat (limited to 'logic')
-rw-r--r--logic/profiler/JVisualVM.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/logic/profiler/JVisualVM.cpp b/logic/profiler/JVisualVM.cpp
index 7b79b2e8..02938028 100644
--- a/logic/profiler/JVisualVM.cpp
+++ b/logic/profiler/JVisualVM.cpp
@@ -39,7 +39,12 @@ void JVisualVM::beginProfilingImpl(MinecraftProcess *process)
void JVisualVMFactory::registerSettings(SettingsObject *settings)
{
- settings->registerSetting("JVisualVMPath");
+ QString defaultValue = QStandardPaths::findExecutable("jvisualvm");
+ if (defaultValue.isNull())
+ {
+ defaultValue = QStandardPaths::findExecutable("visualvm");
+ }
+ settings->registerSetting("JVisualVMPath", defaultValue);
}
BaseExternalTool *JVisualVMFactory::createTool(BaseInstance *instance, QObject *parent)