diff --git a/src/kits/interface/MenuField.cpp b/src/kits/interface/MenuField.cpp index 14a69ad0f6..476fadca16 100644 --- a/src/kits/interface/MenuField.cpp +++ b/src/kits/interface/MenuField.cpp @@ -1288,8 +1288,9 @@ BMenuField::_ValidateLayoutData() font_height& fh = fLayoutData->font_info; GetFontHeight(&fh); - if (Label() != NULL) { - fLayoutData->label_width = ceilf(StringWidth(Label())); + const char* label = Label(); + if (label != NULL) { + fLayoutData->label_width = ceilf(StringWidth(label)); fLayoutData->label_height = ceilf(fh.ascent) + ceilf(fh.descent); } else { fLayoutData->label_width = 0; diff --git a/src/kits/interface/TextControl.cpp b/src/kits/interface/TextControl.cpp index 566721fa90..f4828d670b 100644 --- a/src/kits/interface/TextControl.cpp +++ b/src/kits/interface/TextControl.cpp @@ -1259,8 +1259,9 @@ BTextControl::_ValidateLayoutData() font_height& fh = fLayoutData->font_info; GetFontHeight(&fh); - if (Label() != NULL) { - fLayoutData->label_width = ceilf(StringWidth(Label())); + const char* label = Label(); + if (label != NULL) { + fLayoutData->label_width = ceilf(StringWidth(label)); fLayoutData->label_height = ceilf(fh.ascent) + ceilf(fh.descent); } else { fLayoutData->label_width = 0;