Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2025-03-21 06:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Send: don't open QrCodeScanDialog if no available cameras

Browse source
This commit is contained in:
tobtoht 2021-07-10 22:53:36 +02:00
parent a88425eb60
commit 1816abc150
No known key found for this signature in database
GPG key ID: 1CADD27F41F45C3C
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/SendWidget.cpp
View file

@ -13,6 +13,7 @@
#ifdef WITH_SCANNER #ifdef WITH_SCANNER
#include "qrcode_scanner/QrCodeScanDialog.h" #include "qrcode_scanner/QrCodeScanDialog.h"
#include <QtMultimedia/QCameraInfo>
#endif #endif
SendWidget::SendWidget(QSharedPointer<AppContext> ctx, QWidget *parent) SendWidget::SendWidget(QSharedPointer<AppContext> ctx, QWidget *parent)
@ -112,6 +113,12 @@ void SendWidget::fillAddress(const QString &address) {
void SendWidget::scanClicked() { void SendWidget::scanClicked() {
#ifdef WITH_SCANNER #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); auto *dialog = new QrCodeScanDialog(this);
dialog->exec(); dialog->exec();
ui->lineAddress->setText(dialog->decodedString); ui->lineAddress->setText(dialog->decodedString);

5
src/qrcode_scanner/QrCodeScanDialog.cpp
View file

@ -19,11 +19,6 @@ QrCodeScanDialog::QrCodeScanDialog(QWidget *parent)
ui->icon_warning->setPixmap(pixmap.scaledToWidth(32, Qt::SmoothTransformation)); ui->icon_warning->setPixmap(pixmap.scaledToWidth(32, Qt::SmoothTransformation));
m_cameras = QCameraInfo::availableCameras(); 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) { for (const auto &camera : m_cameras) {
#ifdef Q_OS_WIN #ifdef Q_OS_WIN