From 93a4fbaa04bd4ced78d90ede1ab7de788d00c5d2 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Wed, 3 Jul 2019 18:48:38 -0500 Subject: [PATCH] Avoid crashing when year view's weather icon is NULL This is not a proper solution, because I don't see how it could possibly ever be NULL here. But a huge number of users are reporting this crash, so we have to try something. This fixes #299, but I'm not happy with it. --- src/views/gcal-year-view.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/gcal-year-view.c b/src/views/gcal-year-view.c index 14f5b9de..8812e004 100644 --- a/src/views/gcal-year-view.c +++ b/src/views/gcal-year-view.c @@ -2118,7 +2118,11 @@ update_weather (GcalYearView *self) if (!updated) { gtk_label_set_text (self->temp_label, ""); - gtk_image_clear (self->weather_icon); + /* FIXME: This should never be NULL, but it somehow is. + * https://gitlab.gnome.org/GNOME/gnome-calendar/issues/299 + */ + if (self->weather_icon != NULL) + gtk_image_clear (self->weather_icon); } } -- 2.21.0