aboutsummaryrefslogtreecommitdiff
path: root/logic/profiler/BaseProfiler.cpp
diff options
context:
space:
mode:
authorJan Dalheimer <jan@dalheimer.de>2014-02-16 09:30:38 +0100
committerJan Dalheimer <jan@dalheimer.de>2014-02-16 09:30:38 +0100
commit994972bf5da5584186e6e82c36287afeb6c1e23a (patch)
treed9a3705615f2e459958d612550cbf7b65874bf1d /logic/profiler/BaseProfiler.cpp
parent82b35b5445d88d67c89c6547b24053d31dc35b9c (diff)
downloadPrismLauncher-994972bf5da5584186e6e82c36287afeb6c1e23a.tar.gz
PrismLauncher-994972bf5da5584186e6e82c36287afeb6c1e23a.tar.bz2
PrismLauncher-994972bf5da5584186e6e82c36287afeb6c1e23a.zip
More fixes.
Diffstat (limited to 'logic/profiler/BaseProfiler.cpp')
-rw-r--r--logic/profiler/BaseProfiler.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/logic/profiler/BaseProfiler.cpp b/logic/profiler/BaseProfiler.cpp
index 1a377818..b58e88be 100644
--- a/logic/profiler/BaseProfiler.cpp
+++ b/logic/profiler/BaseProfiler.cpp
@@ -21,7 +21,7 @@ void BaseProfiler::beginProfiling(MinecraftProcess *process)
void BaseProfiler::abortProfiling()
{
- abortProfiling();
+ abortProfilingImpl();
}
void BaseProfiler::abortProfilingImpl()
@@ -32,6 +32,8 @@ void BaseProfiler::abortProfilingImpl()
}
m_profilerProcess->terminate();
m_profilerProcess->deleteLater();
+ m_profilerProcess = 0;
+ emit abortLaunch(tr("Profiler aborted"));
}
qint64 BaseProfiler::pid(QProcess *process)