Stop the camera when the app looses focus, not when the window does

Closes: #871
rgriebl · Apr 29, 2024 · 08e9f53 · 08e9f53
1 parent 96313e0
commit 08e9f53
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/desktop/itemscannerdialog.cpp b/src/desktop/itemscannerdialog.cpp
@@ -13,6 +13,7 @@
 #include <QMediaDevices>
 #include <QCameraDevice>
 #include <QQmlApplicationEngine>
+#include <QGuiApplication>
 
 #include "bricklink/core.h"
 #include "bricklink/item.h"
@@ -176,6 +177,16 @@ ItemScannerDialog::ItemScannerDialog(QWidget *parent)
         if (!m_pinWindow->isChecked())
             accept();
     });
+
+    connect(qApp, &QGuiApplication::applicationStateChanged,
+            this, [this](Qt::ApplicationState state) {
+        if (m_selectCamera->currentIndex() != -1) {
+            auto activeState = (state == Qt::ApplicationActive)
+                                   ? Scanner::Capture::ActiveState::Active
+                                   : Scanner::Capture::ActiveState::SoonInactive;
+            m_capture->setVideoOutputActiveState(activeState);
+        }
+    });
 }
 
 ItemScannerDialog::~ItemScannerDialog()
@@ -244,13 +255,8 @@ void ItemScannerDialog::updateItemTypeFilters()
 
 void ItemScannerDialog::changeEvent(QEvent *e)
 {
-    if ((e->type() == QEvent::ActivationChange) && (m_selectCamera->currentIndex() != -1)) {
-        auto activeState = isActiveWindow() ? Scanner::Capture::ActiveState::Active
-                                            : Scanner::Capture::ActiveState::SoonInactive;
-        m_capture->setVideoOutputActiveState(activeState);
-    } else if (e->type() == QEvent::LanguageChange) {
+    if (e->type() == QEvent::LanguageChange)
         languageChange();
-    }
     QDialog::changeEvent(e);
 }
 

diff --git a/src/scanner/capture.cpp b/src/scanner/capture.cpp
@@ -97,7 +97,7 @@ Capture::Capture(QObject *parent)
             setState(State::Idle);
     });
 
-    d->cameraStopTimer.setInterval(10s);
+    d->cameraStopTimer.setInterval(5s);
     d->cameraStopTimer.setSingleShot(true);
     connect(&d->cameraStopTimer, &QTimer::timeout, this, [this]() {
         if (state() == State::SoonInactive)