diff options
| -rw-r--r-- | proto-ft/ftnoir_protocol_ft.cpp | 3 | ||||
| -rw-r--r-- | proto-wine/ftnoir_protocol_wine.cpp | 8 |
2 files changed, 3 insertions, 8 deletions
diff --git a/proto-ft/ftnoir_protocol_ft.cpp b/proto-ft/ftnoir_protocol_ft.cpp index fe96db93..851cd939 100644 --- a/proto-ft/ftnoir_protocol_ft.cpp +++ b/proto-ft/ftnoir_protocol_ft.cpp @@ -33,9 +33,8 @@ FTNoIR_Protocol::~FTNoIR_Protocol() viewsStop(); FTIRViewsLib.unload(); } - dummyTrackIR.terminate(); dummyTrackIR.kill(); - dummyTrackIR.waitForFinished(50); + dummyTrackIR.close(); } void FTNoIR_Protocol::pose(const double* headpose) 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); } |