From 8609af6cced68a0aabd0005a6994f611967201e1 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Tue, 19 Jul 2016 07:36:21 +0200
Subject: proto/{ft,wine}: simplify qprocess killing logic

---
 proto-wine/ftnoir_protocol_wine.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'proto-wine')

diff --git a/proto-wine/ftnoir_protocol_wine.cpp b/proto-wine/ftnoir_protocol_wine.cpp
index f11ed8cb..bc49ac8c 100644
--- a/proto-wine/ftnoir_protocol_wine.cpp
+++ b/proto-wine/ftnoir_protocol_wine.cpp
@@ -26,12 +26,8 @@ FTNoIR_Protocol::~FTNoIR_Protocol()
         shm->stop = true;
         wrapper.waitForFinished(100);
     }
-    wrapper.terminate();
-    if (!wrapper.waitForFinished(100))
-    {
-        wrapper.kill();
-        wrapper.waitForFinished(42);
-    }
+    wrapper.kill();
+    wrapper.close();
     //shm_unlink("/" WINE_SHM_NAME);
 }
 
-- 
cgit v1.2.3