Merge branch 'dev' of http://192.168.10.5:8099/sane/code_app into dev
This commit is contained in:
commit
c11a08d515
|
@ -1202,7 +1202,7 @@ void MainWindow::on_scanWorkingEvent()
|
||||||
m_isScanning = true;
|
m_isScanning = true;
|
||||||
updateActionStatus();
|
updateActionStatus();
|
||||||
|
|
||||||
if (m_aquireIntoSaveParam.m_isOcr)
|
if (m_aquireIntoSaveParam.m_isOcr && m_scanType == 2)
|
||||||
{
|
{
|
||||||
m_dlgWaitingOcr = new Dialog_WaitingOcr(this);
|
m_dlgWaitingOcr = new Dialog_WaitingOcr(this);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue