From c14526068a6c4fb1b0355b41b15716de8ea50c27 Mon Sep 17 00:00:00 2001 From: Aurora Date: Thu, 21 Apr 2016 23:39:05 +0200 Subject: [PATCH] Minor stuff --- source/firm.c | 6 +++--- source/fs.c | 5 +---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/source/firm.c b/source/firm.c index 758bdea..dc16bc5 100755 --- a/source/firm.c +++ b/source/firm.c @@ -80,9 +80,6 @@ void main(void) //Get pressed buttons u32 pressed = HID_PAD; - - //Determine if we need to autoboot sysNAND - u32 autoBootSys = CONFIG(0); //Determine if A9LH is installed and the user has an updated sysNAND if(a9lhBoot || CONFIG(2)) @@ -143,6 +140,9 @@ void main(void) //If screens are inited or the corresponding option is set, load splash screen if(PDN_GPU_CNT != 1 || CONFIG(8)) loadSplash(); + //Determine if we need to autoboot sysNAND + u32 autoBootSys = CONFIG(0); + //Determine if we need to boot an emuNAND or sysNAND nandType = (pressed & BUTTON_L1) ? autoBootSys : ((pressed & BUTTON_R1) ? updatedSys : !autoBootSys); diff --git a/source/fs.c b/source/fs.c index ea951eb..4645315 100644 --- a/source/fs.c +++ b/source/fs.c @@ -76,11 +76,8 @@ void firmRead(void *dest, const char *firmFolder) u32 id = 0; //Parse the target directory - while(f_readdir(&dir, &info) == FR_OK) + while(f_readdir(&dir, &info) == FR_OK && info.fname[0]) { - //We've parsed the whole folder - if(!info.fname[0]) break; - //Not a cxi if(info.altname[9] != 'A') continue;