Fix issue reported in

f27cdb4543\#commitcomment-24611141, simplify 56e54cd110
This commit is contained in:
Aurora Wright 2017-12-18 04:27:11 +01:00
parent 57d03d6333
commit 20af9c6750
3 changed files with 7 additions and 11 deletions

View File

@ -284,11 +284,9 @@ void configMenu(bool oldPinStatus, u32 oldPinMode)
u32 pressed; u32 pressed;
do do
{ {
pressed = waitInput(true); pressed = waitInput(true) & MENU_BUTTONS;
} }
while(!(pressed & MENU_BUTTONS)); while(!pressed);
pressed &= MENU_BUTTONS;
if(pressed == BUTTON_START) break; if(pressed == BUTTON_START) break;

View File

@ -204,11 +204,9 @@ bool payloadMenu(char *path)
{ {
do do
{ {
pressed = waitInput(true); pressed = waitInput(true) & MENU_BUTTONS;
} }
while(!(pressed & MENU_BUTTONS)); while(!pressed);
pressed &= MENU_BUTTONS;
u32 oldSelectedPayload = selectedPayload; u32 oldSelectedPayload = selectedPayload;

View File

@ -250,9 +250,9 @@ static inline void Draw_ConvertPixelToBGR8(u8 *dst, const u8 *src, GSPGPU_Frameb
green = (px >> 8) & 0xF; green = (px >> 8) & 0xF;
red = (px >> 12) & 0xF; red = (px >> 12) & 0xF;
dst[0] = (blue << 4) | (blue >> 4); dst[0] = (blue << 4) | (blue >> 0);
dst[1] = (green << 4) | (green >> 4); dst[1] = (green << 4) | (green >> 0);
dst[2] = (red << 4) | (red >> 4); dst[2] = (red << 4) | (red >> 0);
break; break;
} }