summaryrefslogtreecommitdiffhomepage
path: root/proto-wine
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-07-19 07:36:21 +0200
committerStanislaw Halik <sthalik@misaki.pl>2016-07-19 07:36:37 +0200
commit8609af6cced68a0aabd0005a6994f611967201e1 (patch)
tree2903056feb5c686ec7edef6a99ce07cd79bb297e /proto-wine
parentef0a2d3df4324f555a7216c527896e48b59bf59f (diff)
proto/{ft,wine}: simplify qprocess killing logic
Diffstat (limited to 'proto-wine')
-rw-r--r--proto-wine/ftnoir_protocol_wine.cpp8
1 files changed, 2 insertions, 6 deletions
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);
}