Re: [gtpd-cvs] SF.net SVN: gtkpod: [2019] gtkpod/trunk

[Mike H. <mi...@fe...>]

jc...@us... wrote:
> 
> Modified: gtkpod/trunk/src/display_photo.c
> ===================================================================
> --- gtkpod/trunk/src/display_photo.c	2008-06-24 18:39:38 UTC (rev 2018)
> +++ gtkpod/trunk/src/display_photo.c	2008-06-28 08:01:29 UTC (rev 2019)
> @@ -148,6 +148,8 @@
>  	db = itdb_photodb_parse (mp, &error);
>  	if (db == NULL)
>  	{
> +	    if (itdb_device_supports_photo (itdb->device))
> +	    {
>  		if (error)
>  		{
>  			gtkpod_warning (_("Error reading iPod photo database (%s).\n"), error->message);
> @@ -158,7 +160,8 @@
>  			gtkpod_warning (_("Error reading iPod photo database.\n"));
>  		}
>  		eitdb->photodb = NULL;
> -		return;
> +	    }
> +	    return;
>  	}
>  

This won't free the error message, currently done on line 156. Also, 
will "eitdb->photodb" always be preinitialized to NULL? If not, line 162 
needs to be outside the supports_photo() conditional.



Mike
-- 

   Mike Heffner  <mi...@fe...>