Send: don't open QrCodeScanDialog if no available cameras

diff --git a/src/SendWidget.cpp b/src/SendWidget.cpp
index 846d6b58a91e08c2bfc2ef4b656b2b3d326f9a5e..b460a083cf2dc72f983aa0bee4268237f7ed96cb 100644 (file)
--- a/src/SendWidget.cpp
+++ b/src/SendWidget.cpp
@@ -13,6 +13,7 @@
 
 #ifdef WITH_SCANNER
 #include "qrcode_scanner/QrCodeScanDialog.h"
+#include <QtMultimedia/QCameraInfo>
 #endif
 
 SendWidget::SendWidget(QSharedPointer<AppContext> ctx, QWidget *parent)
@@ -112,6 +113,12 @@ void SendWidget::fillAddress(const QString &address) {
 
 void SendWidget::scanClicked() {
 #ifdef WITH_SCANNER
+    auto cameras = QCameraInfo::availableCameras();
+    if (cameras.count() < 1) {
+        QMessageBox::warning(this, "QR code scanner", "No available cameras found.");
+        return;
+    }
+
     auto *dialog = new QrCodeScanDialog(this);
     dialog->exec();
     ui->lineAddress->setText(dialog->decodedString);

diff --git a/src/qrcode_scanner/QrCodeScanDialog.cpp b/src/qrcode_scanner/QrCodeScanDialog.cpp
index 1dd78b31777c9392e45b241ee05aff01d2187fd4..d3b97d9e4e437fbcf90c6b0a5c4427b12d286737 100644 (file)
--- a/src/qrcode_scanner/QrCodeScanDialog.cpp
+++ b/src/qrcode_scanner/QrCodeScanDialog.cpp
@@ -19,11 +19,6 @@ QrCodeScanDialog::QrCodeScanDialog(QWidget *parent)
     ui->icon_warning->setPixmap(pixmap.scaledToWidth(32, Qt::SmoothTransformation));
 
     m_cameras = QCameraInfo::availableCameras();
-    if (m_cameras.count() < 1) {
-        QMessageBox::warning(parent, "QR code scanner", "No available cameras found.");
-        this->close();
-        return;
-    }
 
     for (const auto &camera : m_cameras) {
 #ifdef Q_OS_WIN