desktop-shell: better error logging
v2: only call cairo_surface_status once
This commit is contained in:
committed by
Kristian Høgsberg
parent
4a3c150c96
commit
96386b8e5e
@@ -519,13 +519,16 @@ static cairo_surface_t *
|
|||||||
load_icon_or_fallback(const char *icon)
|
load_icon_or_fallback(const char *icon)
|
||||||
{
|
{
|
||||||
cairo_surface_t *surface = cairo_image_surface_create_from_png(icon);
|
cairo_surface_t *surface = cairo_image_surface_create_from_png(icon);
|
||||||
|
cairo_status_t status;
|
||||||
cairo_t *cr;
|
cairo_t *cr;
|
||||||
|
|
||||||
if (cairo_surface_status(surface) == CAIRO_STATUS_SUCCESS)
|
status = cairo_surface_status(surface);
|
||||||
|
if (status == CAIRO_STATUS_SUCCESS)
|
||||||
return surface;
|
return surface;
|
||||||
|
|
||||||
cairo_surface_destroy(surface);
|
cairo_surface_destroy(surface);
|
||||||
fprintf(stderr, "ERROR loading icon from file '%s'\n", icon);
|
fprintf(stderr, "ERROR loading icon from file '%s', error: '%s'\n",
|
||||||
|
icon, cairo_status_to_string(status));
|
||||||
|
|
||||||
/* draw fallback icon */
|
/* draw fallback icon */
|
||||||
surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
|
surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
|
||||||
|
|||||||
Reference in New Issue
Block a user