[Commits] [SCM] claws branch, master, updated. 3.15.0-120-g7263bc5

[mones at claws-mail.org]

The branch, master has been updated
       via  7263bc50139992d2dd4d67233260b24e438dddc0 (commit)
      from  fb5fce43ffcf73d9bd08734b7a84acf0ea8f12a9 (commit)

Summary of changes:
 src/prefs_themes.c |    4 +++-
 src/stock_pixmap.c |    3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 7263bc50139992d2dd4d67233260b24e438dddc0
Author: Ricardo Mones <ricardo at mones.org>
Date:   Mon Jul 24 09:35:05 2017 +0200

    Really handle the NULLs, don't scream at them

diff --git a/src/prefs_themes.c b/src/prefs_themes.c
index 7472c53..820dff3 100644
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -420,7 +420,9 @@ static void prefs_themes_free_names(ThemesData *tdata)
 	GList *names;
 
 	cm_return_if_fail(tdata != NULL);
-	cm_return_if_fail(tdata->names != NULL);
+
+	if (tdata->names == NULL)
+		return;
 
 	names = tdata->names;
 	while (names != NULL) {
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 807d862..593b502 100644
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -840,7 +840,8 @@ void stock_pixmap_themes_list_free(GList *list)
 {
 	GList *ptr;
 
-	cm_return_if_fail(list != NULL);
+	if (list == NULL)
+		return;
 
 	for (ptr = g_list_first(list); ptr != NULL; ptr = g_list_next(ptr))
 		g_free(ptr->data);

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail