[haiku-commits] r41267 - haiku/trunk/src/apps/mail
- From: philippe.houdoin@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 19 Apr 2011 12:03:02 +0200 (CEST)
Author: phoudoin
Date: 2011-04-19 12:03:02 +0200 (Tue, 19 Apr 2011)
New Revision: 41267
Changeset: https://dev.haiku-os.org/changeset/41267
Modified:
haiku/trunk/src/apps/mail/MailWindow.cpp
Log:
Check a menu item is actually marked, just to be safe.
Remove leftover commented code.
Modified: haiku/trunk/src/apps/mail/MailWindow.cpp
===================================================================
--- haiku/trunk/src/apps/mail/MailWindow.cpp 2011-04-19 09:38:37 UTC (rev
41266)
+++ haiku/trunk/src/apps/mail/MailWindow.cpp 2011-04-19 10:03:02 UTC (rev
41267)
@@ -2547,16 +2547,14 @@
WriteAttrString(&draft, B_MAIL_ATTR_BCC,
fHeaderView->fBcc->Text());
// Add account
- //BMenuItem* accountItem = fHeaderView->fAccountMenu->FindMarked();
- //WriteAttrString(&draft, B_MAIL_ATTR_ACCOUNT, accountItem->Label());
- WriteAttrString(&draft, B_MAIL_ATTR_ACCOUNT,
- fHeaderView->fAccountMenu->FindMarked()->Label());
+ BMenuItem* menuItem = fHeaderView->fAccountMenu->FindMarked();
+ if (menuItem != NULL)
+ WriteAttrString(&draft, B_MAIL_ATTR_ACCOUNT, menuItem->Label());
// Add encoding
- //BMenuItem* encodingItem = fHeaderView->fEncodingMenu->FindMarked();
- //WriteAttrString(&draft, "MAIL:encoding", encodingItem->Label());
- WriteAttrString(&draft, "MAIL:encoding",
- fHeaderView->fEncodingMenu->FindMarked()->Label());
+ menuItem = fHeaderView->fEncodingMenu->FindMarked();
+ if (menuItem != NULL)
+ WriteAttrString(&draft, "MAIL:encoding", menuItem->Label());
// Add the draft attribute for indexing
uint32 draftAttr = true;
Other related posts:
- » [haiku-commits] r41267 - haiku/trunk/src/apps/mail - philippe . houdoin
