From 1816abc150cafb92384738638112c245875b335c Mon Sep 17 00:00:00 2001 From: tobtoht Date: Sat, 10 Jul 2021 22:53:36 +0200 Subject: [PATCH] Send: don't open QrCodeScanDialog if no available cameras --- src/SendWidget.cpp | 7 +++++++ src/qrcode_scanner/QrCodeScanDialog.cpp | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/SendWidget.cpp b/src/SendWidget.cpp index 846d6b5..b460a08 100644 --- a/src/SendWidget.cpp +++ b/src/SendWidget.cpp @@ -13,6 +13,7 @@ #ifdef WITH_SCANNER #include "qrcode_scanner/QrCodeScanDialog.h" +#include #endif SendWidget::SendWidget(QSharedPointer 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 1dd78b3..d3b97d9 100644 --- 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