35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From 53a327d53cfc0da5861d65b9bd18cab591689170 Mon Sep 17 00:00:00 2001
|
|
From: Michael Catanzaro <mcatanzaro@igalia.com>
|
|
Date: Wed, 3 Jul 2019 18:50:49 -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 25c432b8..bb4db5f1 100644
|
|
--- a/src/views/gcal-year-view.c
|
|
+++ b/src/views/gcal-year-view.c
|
|
@@ -2154,7 +2154,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
|
|
|