X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-msg-view-window.c;h=605f8df7f9e22b90a6eac2654effc90bf6dc6053;hp=f34f2b6bff836955e58c2bb730b28c473eeac0de;hb=1b00a3aee5cb1c5d77f24aa5ff1189b33e18e477;hpb=4f9624ccaac11b9f05c9f9a93ad8cadd2e78e736

diff --git a/src/hildon2/modest-msg-view-window.c b/src/hildon2/modest-msg-view-window.c
index f34f2b6..605f8df 100644
--- a/src/hildon2/modest-msg-view-window.c
+++ b/src/hildon2/modest-msg-view-window.c
@@ -2753,7 +2753,8 @@ save_attachments_response (GtkDialog *dialog,
 }
 
 void
-modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, TnyList *mime_parts)
+modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, 
+					 TnyList *mime_parts)
 {
 	ModestMsgViewWindowPrivate *priv;
 	GtkWidget *save_dialog = NULL;
@@ -2768,12 +2769,17 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, TnyList *m
 		/* In Hildon 2.2 save and delete operate over all the attachments as there's no
 		 * selection available */
 		mime_parts = modest_msg_view_get_attachments (MODEST_MSG_VIEW (priv->msg_view));
-		if (!modest_maemo_utils_select_attachments (GTK_WINDOW (window), mime_parts, FALSE)) {
+		if (mime_parts && !modest_maemo_utils_select_attachments (GTK_WINDOW (window), mime_parts, FALSE)) {
 			g_object_unref (mime_parts);
 			return;
 		}
-		if (mime_parts == NULL || tny_list_get_length (mime_parts) == 0)
+		if (mime_parts == NULL || tny_list_get_length (mime_parts) == 0) {
+			if (mime_parts) {
+				g_object_unref (mime_parts);
+				mime_parts = NULL;
+			}
 			return;
+		}
 	} else {
 		g_object_ref (mime_parts);
 	}