diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2013-10-24 21:28:53 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2013-10-24 21:28:53 +0200 |
| commit | d201a0aef9bd71cf48ed41486ba549ff22ed3a87 (patch) | |
| tree | d422abf7a30d7dadb366efd3d00e3cda29b4a8e1 /ftnoir_protocol_wine/ftnoir_protocol_wine.cpp | |
| parent | f40d7a58d0032289e6c122bbd57bc8b6bed8ebcd (diff) | |
| parent | e248b039d1110dddc5c3ee13172b75a818f6d265 (diff) | |
Merge branch 'master' of github.com:opentrack/opentrack
Diffstat (limited to 'ftnoir_protocol_wine/ftnoir_protocol_wine.cpp')
| -rw-r--r-- | ftnoir_protocol_wine/ftnoir_protocol_wine.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp b/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp index c5d0754f..d9c3f1e0 100644 --- a/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp +++ b/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp @@ -19,9 +19,14 @@ FTNoIR_Protocol::~FTNoIR_Protocol() { if (shm) { shm->stop = true; - wrapper.waitForFinished(2000); + wrapper.waitForFinished(100); + } + wrapper.terminate(); + if (!wrapper.waitForFinished(100)) + { + wrapper.kill(); + wrapper.waitForFinished(42); } - wrapper.kill(); shm_unlink("/" WINE_SHM_NAME); } |