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