diff --git a/app/scanner2/mainwindow.cpp b/app/scanner2/mainwindow.cpp index 151ba951..eece52e7 100644 --- a/app/scanner2/mainwindow.cpp +++ b/app/scanner2/mainwindow.cpp @@ -54,6 +54,7 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent) : QMainWindow(parent) , ui(new Ui::MainWindow) + , m_canClose(true) , m_currLang(appLang) , m_versionDll(nullptr) , m_admin_loggedIn(false) @@ -2562,6 +2563,12 @@ void MainWindow::on_act_imageInfo_triggered() void MainWindow::closeEvent(QCloseEvent *e) { + if (!m_canClose) + { + e->ignore(); + return; + } + if (m_isScanning) { m_closeTip = true; @@ -4456,6 +4463,7 @@ void MainWindow::on_act_selectDevice_triggered() } this->setEnabled(false); + m_canClose = false; DeviceUser *devUser = m_devUserMgr->OpenDeviceUser(); if (devUser != nullptr) @@ -4479,4 +4487,5 @@ void MainWindow::on_act_selectDevice_triggered() } this->setEnabled(true); + m_canClose = true; } diff --git a/app/scanner2/mainwindow.h b/app/scanner2/mainwindow.h index 96259996..7b81f47a 100644 --- a/app/scanner2/mainwindow.h +++ b/app/scanner2/mainwindow.h @@ -249,6 +249,7 @@ private: private: Ui::MainWindow *ui; + bool m_canClose; DeviceUserMgr *m_devUserMgr; DeviceUser *m_devUser; QAction *m_act_acquireInto2;