From: Andrej Kacian <ticho@claws-mail.org>
Date: Mon, 17 Aug 2015 18:45:38 +0000 (+0200)
Subject: Fix crash on double notification popup.
X-Git-Tag: 3.13.0~73
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=206f559c6f1065be9fa221f00bddaf4e0b669dd9

Fix crash on double notification popup.

Patch by Richard Hughes. Closes bug #3496.
---

diff --git a/AUTHORS b/AUTHORS
index 4bc665a67..5accdbd68 100644
--- 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
index 988091961..70209dbbf 100644
--- 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
index 7393af2bf..180f06700 100644
--- 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",