diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-09-27 08:20:20 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-09-27 08:20:20 +0200 |
| commit | e94622c319e4307617b202f19d3ec05b21a9bb49 (patch) | |
| tree | c5ddf44352b9bd47aeb3eb432ba79638079efe25 /backend/dmc.c | |
| parent | 6f2255c9648b175d51e2c8e5e9670557f9dc4ee1 (diff) | |
merge to 1.0.25+git20150927
Diffstat (limited to 'backend/dmc.c')
| -rw-r--r-- | backend/dmc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/backend/dmc.c b/backend/dmc.c index 96f9186..7fc2ae9 100644 --- a/backend/dmc.c +++ b/backend/dmc.c @@ -75,6 +75,7 @@ static DMC_Device *FirstDevice = NULL; static DMC_Camera *FirstHandle = NULL; static int NumDevices = 0; +static SANE_Device const **devlist = NULL; static SANE_String_Const ValidModes[] = { "Full frame", "Viewfinder", "Raw", "Thumbnail", @@ -867,6 +868,9 @@ sane_exit(void) free(dev); dev = next; } + + if (devlist) + free (devlist); } /********************************************************************** @@ -882,7 +886,6 @@ sane_exit(void) SANE_Status sane_get_devices(SANE_Device const ***device_list, SANE_Bool local_only) { - static SANE_Device const **devlist = 0; DMC_Device *dev; int i = 0; |