Merge branch 'master' of http://192.168.10.5:8099/sane/code_production
This commit is contained in:
commit
405a7dd7b0
|
@ -84,7 +84,6 @@ void hgscanner::test_callback(const wchar_t* name, test_event ev, void* data, si
|
|||
if (data != nullptr)
|
||||
{
|
||||
info = QObject::tr("failed: ") + QString::fromStdWString((const wchar_t*)data);
|
||||
}
|
||||
|
||||
if (m_interface != nullptr)
|
||||
{
|
||||
|
@ -95,6 +94,7 @@ void hgscanner::test_callback(const wchar_t* name, test_event ev, void* data, si
|
|||
emit m_burnMode->testResult(flag);
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (ev == TEST_EVENT_MANUAL_CONFIRMATION)
|
||||
{
|
||||
if (data != nullptr)
|
||||
|
|
Loading…
Reference in New Issue