i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rework r41321, check first character to see if string is empty. Thanks Ingo and Axel!

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41344 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexander von Gluck IV
2011-05-06 18:30:36 +00:00
parent 0974aaee15
commit 829200a090
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/powerstatus/ExtendedInfoWindow.cpp
+4 -8
View File
@@ -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");