mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix work with pre-configured device

merge-requests/569/head
ThierryFR 2023-10-09 20:54:48 +00:00
rodzic fd7b83c8f7
commit d8c3848765
1 zmienionych plików z 9 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
backend/escl/escl.c
Wyświetl plik

@ -621,16 +621,20 @@ sane_get_devices(const SANE_Device ***device_list, SANE_Bool local_only)
ESCL_Device *dev = NULL; ESCL_Device *dev = NULL;
static const SANE_Device **devlist = 0; static const SANE_Device **devlist = 0;
SANE_Status status; SANE_Status status;
SANE_Status status2;
if (device_list == NULL) if (device_list == NULL)
return (SANE_STATUS_INVAL); return (SANE_STATUS_INVAL);
status = sanei_configure_attach(ESCL_CONFIG_FILE, NULL, status2 = sanei_configure_attach(ESCL_CONFIG_FILE, NULL,
attach_one_config, NULL); attach_one_config, NULL);
if (status != SANE_STATUS_GOOD)
return (status);
escl_devices(&status); escl_devices(&status);
if (status != SANE_STATUS_GOOD && status2 != SANE_STATUS_GOOD)
{
if (status2 != SANE_STATUS_GOOD)
return (status2);
if (status != SANE_STATUS_GOOD) if (status != SANE_STATUS_GOOD)
return (status); return (status);
}
if (devlist) if (devlist)
free(devlist); free(devlist);
devlist = (const SANE_Device **) calloc (num_devices + 1, sizeof (devlist[0])); devlist = (const SANE_Device **) calloc (num_devices + 1, sizeof (devlist[0]));