Merge branch 'master' into developer

This commit is contained in:
Aurora 2016-09-03 23:08:27 +02:00
commit a78889523f

View File

@ -234,7 +234,7 @@ void configMenu(bool oldPinStatus)
configData.config |= (singleOptions[i].enabled ? 1 : 0) << (i + 16); configData.config |= (singleOptions[i].enabled ? 1 : 0) << (i + 16);
if(CONFIG(7)) newPin(oldPinStatus); if(CONFIG(7)) newPin(oldPinStatus);
else if(oldPinStatus) fileDelete("/luma/pin.bin"); else if(oldPinStatus) fileDelete(PIN_PATH);
//Wait for the pressed buttons to change //Wait for the pressed buttons to change
while(HID_PAD & PIN_BUTTONS); while(HID_PAD & PIN_BUTTONS);