Merge PR #3188: Overlay_win: properly terminate our overlay helper pr…

…ocesses.
mumble-voip · Jul 20, 2017 · 14ac2b3 · 14ac2b3
2 parents 346702f + 3ea9f08
commit 14ac2b3
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/mumble/Overlay_win.cpp b/src/mumble/Overlay_win.cpp
@@ -133,6 +133,18 @@ OverlayPrivateWin::~OverlayPrivateWin() {
 		qFatal("OverlayPrivateWin: unable to close Mumble process handle.");
 		return;
 	}
+
+	// Remove all signals, so they don't
+	// interfere with our calls to waitForFinished
+	// below.
+	m_helper_process->disconnect();
+	m_helper64_process->disconnect();
+
+	m_helper_process->terminate();
+	m_helper64_process->terminate();
+
+	m_helper_process->waitForFinished();
+	m_helper64_process->waitForFinished();
 }
 
 void OverlayPrivateWin::startHelper(QProcess *helper) {