1 files changed, 28 insertions, 0 deletions
diff --git a/src/plugins/directshow/camera/dscamerasession.cpp b/src/plugins/directshow/camera/dscamerasession.cpp
index 324ab44e2..c309359ed 100644
--- a/src/plugins/directshow/camera/dscamerasession.cpp
+++ b/src/plugins/directshow/camera/dscamerasession.cpp
@@ -76,6 +76,30 @@ DSCameraSession::DSCameraSession(QObject *parent)
 {
     connect(this, SIGNAL(statusChanged(QCamera::Status)),
             this, SLOT(updateReadyForCapture()));
+
+    m_deviceLostEventTimer.setSingleShot(true);
+    connect(&m_deviceLostEventTimer, &QTimer::timeout, [&]() {
+        IMediaEvent *pEvent = com_cast<IMediaEvent>(m_filterGraph, IID_IMediaEvent);
+        if (!pEvent)
+            return;
+
+        long eventCode;
+        LONG_PTR param1;
+        LONG_PTR param2;
+        while (pEvent->GetEvent(&eventCode, &param1, &param2, 0) == S_OK) {
+            switch (eventCode) {
+            case EC_DEVICE_LOST:
+                unload();
+                break;
+            default:
+                break;
+            }
+
+            pEvent->FreeEventParams(eventCode, param1, param2);
+        }
+
+        pEvent->Release();
+    });
 }
 
 DSCameraSession::~DSCameraSession()
@@ -582,6 +606,10 @@ void DSCameraSession::onFrameAvailable(double time, const QByteArray &data)
 
     m_presentMutex.lock();
 
+    // If no frames provided from ISampleGrabber for some time
+    // the device might be potentially unplugged.
+    m_deviceLostEventTimer.start(100);
+
     // (We should be getting only RGB32 data)
     int stride = m_previewSize.width() * 4;