Browse Source

Send: don't open QrCodeScanDialog if no available cameras

build_fixes
tobtoht 5 months ago
parent
commit
1816abc150
Signed by: tobtoht GPG Key ID: 1CADD27F41F45C3C
  1. 7
      src/SendWidget.cpp
  2. 5
      src/qrcode_scanner/QrCodeScanDialog.cpp

7
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);

5
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

Loading…
Cancel
Save