This commit is contained in:
parent
b41433ed15
commit
9191449e94
|
@ -54,6 +54,7 @@
|
||||||
MainWindow::MainWindow(const QString& appLang, QWidget *parent)
|
MainWindow::MainWindow(const QString& appLang, QWidget *parent)
|
||||||
: QMainWindow(parent)
|
: QMainWindow(parent)
|
||||||
, ui(new Ui::MainWindow)
|
, ui(new Ui::MainWindow)
|
||||||
|
, m_canClose(true)
|
||||||
, m_currLang(appLang)
|
, m_currLang(appLang)
|
||||||
, m_versionDll(nullptr)
|
, m_versionDll(nullptr)
|
||||||
, m_admin_loggedIn(false)
|
, m_admin_loggedIn(false)
|
||||||
|
@ -2562,6 +2563,12 @@ void MainWindow::on_act_imageInfo_triggered()
|
||||||
|
|
||||||
void MainWindow::closeEvent(QCloseEvent *e)
|
void MainWindow::closeEvent(QCloseEvent *e)
|
||||||
{
|
{
|
||||||
|
if (!m_canClose)
|
||||||
|
{
|
||||||
|
e->ignore();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (m_isScanning)
|
if (m_isScanning)
|
||||||
{
|
{
|
||||||
m_closeTip = true;
|
m_closeTip = true;
|
||||||
|
@ -4456,6 +4463,7 @@ void MainWindow::on_act_selectDevice_triggered()
|
||||||
}
|
}
|
||||||
|
|
||||||
this->setEnabled(false);
|
this->setEnabled(false);
|
||||||
|
m_canClose = false;
|
||||||
|
|
||||||
DeviceUser *devUser = m_devUserMgr->OpenDeviceUser();
|
DeviceUser *devUser = m_devUserMgr->OpenDeviceUser();
|
||||||
if (devUser != nullptr)
|
if (devUser != nullptr)
|
||||||
|
@ -4479,4 +4487,5 @@ void MainWindow::on_act_selectDevice_triggered()
|
||||||
}
|
}
|
||||||
|
|
||||||
this->setEnabled(true);
|
this->setEnabled(true);
|
||||||
|
m_canClose = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -249,6 +249,7 @@ private:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Ui::MainWindow *ui;
|
Ui::MainWindow *ui;
|
||||||
|
bool m_canClose;
|
||||||
DeviceUserMgr *m_devUserMgr;
|
DeviceUserMgr *m_devUserMgr;
|
||||||
DeviceUser *m_devUser;
|
DeviceUser *m_devUser;
|
||||||
QAction *m_act_acquireInto2;
|
QAction *m_act_acquireInto2;
|
||||||
|
|
Loading…
Reference in New Issue