From 31c65be109011d26204e5924cd197b3ff121057c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 2 Sep 2015 20:54:59 +0200 Subject: [PATCH] Mail: fixed crash on resend. * Seems to have been there for quite some time. Probably a good reason to remove that feature altogether. --- src/apps/mail/MailWindow.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/apps/mail/MailWindow.cpp b/src/apps/mail/MailWindow.cpp index e02f89f72f..ee062a57d3 100644 --- a/src/apps/mail/MailWindow.cpp +++ b/src/apps/mail/MailWindow.cpp @@ -184,6 +184,7 @@ TMailWindow::TMailWindow(BRect rect, const char* title, TMailApp* app, fRef(NULL), fFieldState(0), fPanel(NULL), + fSaveAddrMenu(NULL), fLeaveStatusMenu(NULL), fEncodingMenu(NULL), fZoom(rect), @@ -434,9 +435,6 @@ TMailWindow::TMailWindow(BRect rect, const char* title, TMailApp* app, fNextMsg = new BMenuItem(B_TRANSLATE("Next message"), new BMessage(M_NEXTMSG), B_DOWN_ARROW); menu->AddItem(fNextMsg); - menu->AddSeparatorItem(); - fSaveAddrMenu = subMenu = new BMenu(B_TRANSLATE("Save address")); - menu->AddItem(subMenu); } else { menu->AddItem(fSendNow = new BMenuItem(B_TRANSLATE("Send message"), new BMessage(M_SEND_NOW), 'M')); @@ -459,6 +457,11 @@ TMailWindow::TMailWindow(BRect rect, const char* title, TMailApp* app, new BMessage(M_REMOVE), 'T')); } } + if (fIncoming) { + menu->AddSeparatorItem(); + fSaveAddrMenu = new BMenu(B_TRANSLATE("Save address")); + menu->AddItem(fSaveAddrMenu); + } // Encoding menu