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

Merge branch '25-xscanimage-crashes-with-test-backend' into 'master' 

Resolve "xscanimage crashes with test backend"

Closes #25

See merge request sane-project/frontends!4
merge-requests/7/head
Ralph Little 2021-08-25 03:39:33 +00:00
rodzic 0d96bd19fb 02478dc10b
commit 4c234b1512
2 zmienionych plików z 8 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
src/gtkglue.c
Wyświetl plik

@ -403,10 +403,10 @@ button_update (GtkWidget * widget, GSGDialogElement * elem)
{
GSGDialog *dialog = elem->dialog;
int opt_num = elem - dialog->element;
const SANE_Option_Descriptor *opt;
// const SANE_Option_Descriptor *opt;
SANE_Word val = SANE_FALSE;
opt = sane_get_option_descriptor (dialog->dev, opt_num);
// opt = sane_get_option_descriptor (dialog->dev, opt_num);
if (GTK_TOGGLE_BUTTON (widget)->active)
val = SANE_TRUE;
set_option (dialog, opt_num, &val, SANE_ACTION_SET_VALUE);
@ -1420,12 +1420,16 @@ gsg_sync (GSGDialog * dialog)
if (!SANE_OPTION_IS_ACTIVE (opt->cap))
continue;
if (opt->type != SANE_TYPE_INT && opt->type != SANE_TYPE_FIXED)
if ((opt->type != SANE_TYPE_INT) && (opt->type != SANE_TYPE_FIXED))
continue;
if (opt->size == sizeof (SANE_Word))
continue;
// If curves is hidden (advanced option perhaps) then nothing to do.
if (!dialog->element[i].widget)
continue;
/* ok, we're dealing with an active vector */
optlen = opt->size / sizeof (SANE_Word);

1
src/scanadf.c
Wyświetl plik

@ -1709,6 +1709,7 @@ List of available devices:", prog_name);
sane_cancel (device);
sane_close (device);
sane_exit();
if (scriptWait)
while (wait(NULL) != -1);