aboutsummaryrefslogtreecommitdiff
path: root/logic/profiler/BaseProfiler.cpp
diff options
context:
space:
mode:
authorJan Dalheimer <jan@dalheimer.de>2014-02-16 08:54:52 +0100
committerJan Dalheimer <jan@dalheimer.de>2014-02-16 08:54:52 +0100
commit82b35b5445d88d67c89c6547b24053d31dc35b9c (patch)
tree333b6a40d558ab3022f7e68297f9b14863c854bc /logic/profiler/BaseProfiler.cpp
parent7ceb2cacb129d5924087f616cfc0b949689ed4fe (diff)
downloadPrismLauncher-82b35b5445d88d67c89c6547b24053d31dc35b9c.tar.gz
PrismLauncher-82b35b5445d88d67c89c6547b24053d31dc35b9c.tar.bz2
PrismLauncher-82b35b5445d88d67c89c6547b24053d31dc35b9c.zip
Fix stuff. Make sure different ways of aborting profiling work.
Diffstat (limited to 'logic/profiler/BaseProfiler.cpp')
-rw-r--r--logic/profiler/BaseProfiler.cpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/logic/profiler/BaseProfiler.cpp b/logic/profiler/BaseProfiler.cpp
index 4765c67d..1a377818 100644
--- a/logic/profiler/BaseProfiler.cpp
+++ b/logic/profiler/BaseProfiler.cpp
@@ -19,6 +19,21 @@ void BaseProfiler::beginProfiling(MinecraftProcess *process)
beginProfilingImpl(process);
}
+void BaseProfiler::abortProfiling()
+{
+ abortProfiling();
+}
+
+void BaseProfiler::abortProfilingImpl()
+{
+ if (!m_profilerProcess)
+ {
+ return;
+ }
+ m_profilerProcess->terminate();
+ m_profilerProcess->deleteLater();
+}
+
qint64 BaseProfiler::pid(QProcess *process)
{
#ifdef Q_OS_WIN