From 82b35b5445d88d67c89c6547b24053d31dc35b9c Mon Sep 17 00:00:00 2001
From: Jan Dalheimer <jan@dalheimer.de>
Date: Sun, 16 Feb 2014 08:54:52 +0100
Subject: Fix stuff. Make sure different ways of aborting profiling work.

---
 logic/profiler/JProfiler.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'logic/profiler/JProfiler.cpp')

diff --git a/logic/profiler/JProfiler.cpp b/logic/profiler/JProfiler.cpp
index cec614ae..34f927ce 100644
--- a/logic/profiler/JProfiler.cpp
+++ b/logic/profiler/JProfiler.cpp
@@ -22,7 +22,16 @@ void JProfiler::beginProfilingImpl(MinecraftProcess *process)
 							 .absoluteFilePath("bin/jpenable"));
 	connect(profiler, &QProcess::started, [this, port]()
 	{ emit readyToLaunch(tr("Listening on port: %1").arg(port)); });
-	connect(profiler, SIGNAL(finished(int)), profiler, SLOT(deleteLater()));
+	connect(profiler,
+			static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
+			[this](int exit, QProcess::ExitStatus status)
+	{
+		if (exit != 0 || status == QProcess::CrashExit)
+		{
+			emit abortLaunch(tr("Profiler aborted"));
+		}
+		m_profilerProcess->deleteLater();
+	});
 	profiler->start();
 }
 
-- 
cgit