mika/nx-hbmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Permit PSM calls only when initialized

Browse Source 
- Change hardcoded int to enum in variable init
This commit is contained in:
Daniel Bernard 2018-10-07 17:50:33 -05:00
parent 87aca212ce
commit caedcab0ac
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/menu.c
View File

@ -445,10 +445,14 @@ void drawCharge() {
char chargeString[5]; char chargeString[5];
uint32_t batteryCharge; uint32_t batteryCharge;
ChargerType chargeType = 0; ChargerType chargeType = ChargerType_None;
#ifdef __SWITCH__ #ifdef __SWITCH__
psmGetBatteryChargePercentage(&batteryCharge); if (psmInitialized)
{
psmGetBatteryChargePercentage(&batteryCharge);
psmGetChargerType(&chargeType);
}
#else #else
batteryCharge = 100; batteryCharge = 100;
#endif #endif
@ -459,10 +463,6 @@ void drawCharge() {
DrawText(interuiregular14, tmpX, 0 + 47 + 10 + 21, themeCurrent.textColor, chargeString); DrawText(interuiregular14, tmpX, 0 + 47 + 10 + 21, themeCurrent.textColor, chargeString);
#ifdef __SWITCH__
psmGetChargerType(&chargeType);
#endif
if (chargeType > (ChargerType)ChargerType_None) if (chargeType > (ChargerType)ChargerType_None)
drawImage(tmpX - 20, 0 + 47 + 10 + 5, 9, 15, charging_icon_small, IMAGE_MODE_RGBA32); drawImage(tmpX - 20, 0 + 47 + 10 + 5, 9, 15, charging_icon_small, IMAGE_MODE_RGBA32);
} }