From 0155af407c3bd1f3d805b77881476bdc0de8328d Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 7 Mar 2020 11:28:42 +0100 Subject: fix qprocess race on unix --- video-ps3eye/module.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'video-ps3eye') 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); } } -- cgit v1.2.3