summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2019-07-05 11:20:14 +0200
committerStanislaw Halik <sthalik@misaki.pl>2019-07-05 12:43:07 +0200
commit8f7c69ede20116a533512bff9cd5b23cfbbd0293 (patch)
tree969ee43ab6242246e0c20e0cc85d96d9603c084d
parentb8cb2e19237a3c7b51b74a72c2e241627bc88256 (diff)
proto/wine: fix qprocess warning
-rw-r--r--proto-wine/ftnoir_protocol_wine.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/proto-wine/ftnoir_protocol_wine.cpp b/proto-wine/ftnoir_protocol_wine.cpp
index edeb8ce4..1b259fd4 100644
--- a/proto-wine/ftnoir_protocol_wine.cpp
+++ b/proto-wine/ftnoir_protocol_wine.cpp
@@ -18,11 +18,16 @@ wine::wine() = default;
wine::~wine()
{
#ifndef OTR_WINE_NO_WRAPPER
+ bool exit = false;
if (shm) {
shm->stop = true;
- wrapper.waitForFinished(100);
+ exit = wrapper.waitForFinished(100);
+ }
+ if (!exit)
+ {
+ wrapper.kill();
+ wrapper.waitForFinished(-1);
}
- wrapper.kill();
#endif
//shm_unlink("/" WINE_SHM_NAME);
}