mirror of
https://git.freebsd.org/ports.git
synced 2025-05-01 11:06:39 -04:00
345e28cb1c
Old version crashes on 15.0-CURRENT amd64. Also improve port: fix dependencies, add default option AVAHI. PR: 284127 Approved by: J.R. Oldroyd <fbsd@opal.com> Tested by: rhurlin MFH: 2025Q1
27 lines
872 B
C++
27 lines
872 B
C++
--- src/Controller/Src/Scanner/Scanner.cpp.orig 2024-09-12 07:10:36 UTC
|
|
+++ src/Controller/Src/Scanner/Scanner.cpp
|
|
@@ -183,7 +183,7 @@ void Scanner::EngineCallBackReceiver(EngineEventType e
|
|
error == kSDIErrorDataSend ||
|
|
error == kSDIErrorInvalidResponse ||
|
|
error == kSDIErrorDeviceFatalError ||
|
|
- error == kESErrorDeviceOpenError )
|
|
+ error == (SDIError) kESErrorDeviceOpenError )
|
|
{
|
|
SDI_TRACE_LOG("communication error occurs");
|
|
isOpened_ = false;
|
|
@@ -197,13 +197,13 @@ SDIError Scanner::Open()
|
|
SDIError err;
|
|
if (engine_) {
|
|
err = engine_->Open();
|
|
- if(err != kSDIErrorNone){
|
|
+ if(err != kSDIErrorNone && err != kSDIErrorDeviceOpen){
|
|
return err;
|
|
}
|
|
}
|
|
if (engineSecond_) {
|
|
err = engineSecond_->Open();
|
|
- if(err != kSDIErrorNone){
|
|
+ if(err != kSDIErrorNone && err != kSDIErrorDeviceOpen){
|
|
return err;
|
|
}
|
|
}
|