number of buttons expanded to 15. Contour shuttle pro v2 full support

[kdenlive] / src / jogshuttle.cpp

diff --git a/src/jogshuttle.cpp b/src/jogshuttle.cpp
index 8446076e95da3e74a9186a29b5f0dd867ecabb1e..1cde287f80e4e780c2ed27bb9f49195736a986ad 100644 (file)
--- a/src/jogshuttle.cpp
+++ b/src/jogshuttle.cpp
@@ -203,7 +203,7 @@ JogShuttle::JogShuttle(QString device, QObject *parent) :
 
 JogShuttle::~JogShuttle()
 {
-    if (m_shuttleProcess.isRunning()) m_shuttleProcess.exit();
+       stopDevice();
 }
 
 void JogShuttle::initDevice(QString device)
@@ -218,8 +218,19 @@ void JogShuttle::initDevice(QString device)
 
 void JogShuttle::stopDevice()
 {
-    if (m_shuttleProcess.isRunning())
+    if (m_shuttleProcess.isRunning()) {
+       /* the read fd is in blocking mode => stop_me is broken at the moment */
         m_shuttleProcess.stop_me = true;
+        m_shuttleProcess.exit();
+        /* give the thread some time to shutdown */
+        m_shuttleProcess.wait(100);
+
+        /* if still running - do it in the hardcore way */
+        if (m_shuttleProcess.isRunning()) {
+               m_shuttleProcess.terminate();
+            kDebug() << "/// terminate jogshuttle process\n";
+        }
+    }
 }
 
 void JogShuttle::customEvent(QEvent* e)