summaryrefslogtreecommitdiffhomepage
path: root/video-ps3eye/module.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'video-ps3eye/module.cpp')
-rw-r--r--video-ps3eye/module.cpp14
1 files changed, 2 insertions, 12 deletions
diff --git a/video-ps3eye/module.cpp b/video-ps3eye/module.cpp
index 26b771e2..fe6b51b8 100644
--- a/video-ps3eye/module.cpp
+++ b/video-ps3eye/module.cpp
@@ -112,19 +112,9 @@ void ps3eye_camera::stop()
if (wrapper.state() != QProcess::NotRunning)
{
- if (shm.success())
- {
- volatile auto& ptr = *(ps3eye::shm*)shm.ptr();
- ptr.in.do_exit = true;
- if (!wrapper.waitForFinished(500))
- wrapper.kill();
- wrapper.waitForFinished(-1);
- }
- else
- {
+ if (wrapper.state() != QProcess::NotRunning)
wrapper.kill();
- wrapper.waitForFinished(-1);
- }
+ wrapper.waitForFinished(1000);
}
}