talons

commit 206f559c6f1065be9fa221f00bddaf4e0b669dd9
parent 31806c2352c74a2df322b3483b58123d9320e852
Author: Andrej Kacian <ticho@claws-mail.org>
Date:   Mon, 17 Aug 2015 20:45:38 +0200

Fix crash on double notification popup.

Patch by Richard Hughes. Closes bug #3496.

Diffstat:
M
AUTHORS
 | 
1
+
M
src/gtk/authors.h
 | 
1
+
M
src/plugins/notification/notification_popup.c
 | 
4
+++-

3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/AUTHORS b/AUTHORS
@@ -307,3 +307,4 @@ contributors (in addition to the above; based on Changelog)
 	Robert David
 	Oliver Schneider
 	Jean Diraison
+	Richard Hughes
diff --git a/src/gtk/authors.h b/src/gtk/authors.h
@@ -161,6 +161,7 @@ static char *CONTRIBS_LIST[] = {
 "Michihide Hotta",
 "Shawn Houston",
 "Michael Hughes",
+"Richard Hughes",
 "Chideok Hwang",
 "John E.P. Hynes",
 "Hironori IWANE",
diff --git a/src/plugins/notification/notification_popup.c b/src/plugins/notification/notification_popup.c
@@ -566,8 +566,10 @@ static gboolean notification_popup_add_msg(MsgInfo *msginfo)
     ppopup->msg_path = NULL;
   }
 
-  if(ppopup->label2)
+  if(ppopup->label2) {
     gtk_widget_destroy(ppopup->label2);
+		ppopup->label2 = NULL;
+	}
 
   message = g_strdup_printf(ngettext("%d new message",
 				     "%d new messages",