From 829200a090b8a35bc4048c18bd4dbecd3a0fe69f Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Fri, 6 May 2011 18:30:36 +0000 Subject: [PATCH] rework r41321, check first character to see if string is empty. Thanks Ingo and Axel! git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41344 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/powerstatus/ExtendedInfoWindow.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/apps/powerstatus/ExtendedInfoWindow.cpp b/src/apps/powerstatus/ExtendedInfoWindow.cpp index 2f693e05fe..1c246c7625 100644 --- a/src/apps/powerstatus/ExtendedInfoWindow.cpp +++ b/src/apps/powerstatus/ExtendedInfoWindow.cpp @@ -137,14 +137,10 @@ BatteryInfoView::_FillStringList() else if (fBatteryInfo.state & BATTERY_DISCHARGING) fontString->string = B_TRANSLATE("Battery discharging"); else if (fBatteryInfo.state & BATTERY_CRITICAL_STATE - && (!fBatteryExtendedInfo.model_number - || !strlen(fBatteryExtendedInfo.model_number)) - && (!fBatteryExtendedInfo.serial_number - || !strlen(fBatteryExtendedInfo.serial_number)) - && (!fBatteryExtendedInfo.type - || !strlen(fBatteryExtendedInfo.type)) - && (!fBatteryExtendedInfo.oem_info - || !strlen(fBatteryExtendedInfo.oem_info))) + && fBatteryExtendedInfo.model_number[0] == '\0' + && fBatteryExtendedInfo.serial_number[0] == '\0' + && fBatteryExtendedInfo.type[0] == '\0' + && fBatteryExtendedInfo.oem_info[0] == '\0') fontString->string = B_TRANSLATE("Empty battery slot"); else if (fBatteryInfo.state & BATTERY_CRITICAL_STATE) fontString->string = B_TRANSLATE("Damaged battery");