解决点击继续扫描会造成崩溃问题
This commit is contained in:
parent
49c789023f
commit
e156c5db26
|
@ -701,7 +701,7 @@ void MainWindow::on_AcquireInto2()
|
||||||
|
|
||||||
if (HGBASE_ERR_OK != ret && deviceIsOnline)
|
if (HGBASE_ERR_OK != ret && deviceIsOnline)
|
||||||
{
|
{
|
||||||
on_scanFinishEvent();
|
emit m_devUser->scanFinishEvent();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1411,7 +1411,6 @@ void MainWindow::on_scanFinishEvent()
|
||||||
ret = m_devUser->StartScan();
|
ret = m_devUser->StartScan();
|
||||||
|
|
||||||
bool deviceIsOnline = true;
|
bool deviceIsOnline = true;
|
||||||
ret = m_devUser->StartScan();
|
|
||||||
#if defined(HG_CMP_MSC)
|
#if defined(HG_CMP_MSC)
|
||||||
|
|
||||||
if (HGTWAIN_ERR_DEVICEOFFLINE == ret)
|
if (HGTWAIN_ERR_DEVICEOFFLINE == ret)
|
||||||
|
@ -1437,7 +1436,7 @@ void MainWindow::on_scanFinishEvent()
|
||||||
|
|
||||||
if (HGBASE_ERR_OK != ret && deviceIsOnline)
|
if (HGBASE_ERR_OK != ret && deviceIsOnline)
|
||||||
{
|
{
|
||||||
on_scanFinishEvent();
|
emit m_devUser->scanFinishEvent();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3474,7 +3473,7 @@ void MainWindow::on_act_acquire_triggered()
|
||||||
|
|
||||||
if (HGBASE_ERR_OK != ret && deviceIsOnline)
|
if (HGBASE_ERR_OK != ret && deviceIsOnline)
|
||||||
{
|
{
|
||||||
on_scanFinishEvent();
|
emit m_devUser->scanFinishEvent();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3533,7 +3532,7 @@ void MainWindow::on_act_acquireSingle_triggered()
|
||||||
|
|
||||||
if (HGBASE_ERR_OK != ret && deviceIsOnline)
|
if (HGBASE_ERR_OK != ret && deviceIsOnline)
|
||||||
{
|
{
|
||||||
on_scanFinishEvent();
|
emit m_devUser->scanFinishEvent();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3606,7 +3605,7 @@ void MainWindow::on_act_acquireInto_triggered()
|
||||||
|
|
||||||
if (HGBASE_ERR_OK != ret && deviceIsOnline)
|
if (HGBASE_ERR_OK != ret && deviceIsOnline)
|
||||||
{
|
{
|
||||||
on_scanFinishEvent();
|
emit m_devUser->scanFinishEvent();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3694,7 +3693,7 @@ void MainWindow::on_act_insertFromScanner_triggered()
|
||||||
|
|
||||||
if (HGBASE_ERR_OK != ret && deviceIsOnline)
|
if (HGBASE_ERR_OK != ret && deviceIsOnline)
|
||||||
{
|
{
|
||||||
on_scanFinishEvent();
|
emit m_devUser->scanFinishEvent();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue