解决选择twain源时卡死的问题
This commit is contained in:
parent
aa9e5916ce
commit
20f6b491d3
|
@ -4443,21 +4443,21 @@ void MainWindow::on_act_selectDevice_triggered()
|
|||
m_versionDll->PostUserLogoutInfo(HGVERSION_APPNAME_SCANNER, m_oemName);
|
||||
}
|
||||
|
||||
if (nullptr != m_devUser)
|
||||
{
|
||||
disconnect(m_devUser, SIGNAL(newImage(void*)), this, SLOT(on_newImage(void*)));
|
||||
disconnect(m_devUser, SIGNAL(scanWorkingEvent()), this, SLOT(on_scanWorkingEvent()));
|
||||
disconnect(m_devUser, SIGNAL(scanFinishEvent()), this, SLOT(on_scanFinishEvent()));
|
||||
m_devUser->Logout();
|
||||
delete m_devUser;
|
||||
m_devUser = nullptr;
|
||||
m_wndStatusBar->setDeviceStatusInfo(tr("Please go to 'Menu Bar ->Scan' to select a device"), false);
|
||||
updateActionStatus();
|
||||
}
|
||||
|
||||
DeviceUser *devUser = m_devUserMgr->OpenDeviceUser();
|
||||
if (devUser != nullptr)
|
||||
{
|
||||
if (nullptr != m_devUser)
|
||||
{
|
||||
disconnect(m_devUser, SIGNAL(newImage(void*)), this, SLOT(on_newImage(void*)));
|
||||
disconnect(m_devUser, SIGNAL(scanWorkingEvent()), this, SLOT(on_scanWorkingEvent()));
|
||||
disconnect(m_devUser, SIGNAL(scanFinishEvent()), this, SLOT(on_scanFinishEvent()));
|
||||
m_devUser->Logout();
|
||||
delete m_devUser;
|
||||
m_devUser = nullptr;
|
||||
m_wndStatusBar->setDeviceStatusInfo(tr("Please go to 'Menu Bar ->Scan' to select a device"), false);
|
||||
updateActionStatus();
|
||||
}
|
||||
|
||||
if (HGBASE_ERR_OK == devUser->Open())
|
||||
{
|
||||
m_devUser = devUser;
|
||||
|
|
Loading…
Reference in New Issue