From 6675c3c3db9b933a4c36068e19173e85c4762dd4 Mon Sep 17 00:00:00 2001 From: dborth Date: Tue, 21 Apr 2009 22:10:39 +0000 Subject: [PATCH] menu disabled when loading a game --- source/ngc/fileop.cpp | 4 ---- source/ngc/menu.cpp | 6 ++++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/source/ngc/fileop.cpp b/source/ngc/fileop.cpp index 20ee102..3e73885 100644 --- a/source/ngc/fileop.cpp +++ b/source/ngc/fileop.cpp @@ -188,10 +188,6 @@ bool MountFAT(int method) mounted = false; else if(!fatMountSimple(name, disc)) mounted = false; -#ifdef HW_RVL - else - fatSetReadAhead(rootdir, 6, 64); -#endif } isMounted[method] = mounted; diff --git a/source/ngc/menu.cpp b/source/ngc/menu.cpp index b861287..0716032 100644 --- a/source/ngc/menu.cpp +++ b/source/ngc/menu.cpp @@ -369,6 +369,7 @@ ProgressWindow(char *title, char *msg) return; HaltGui(); + int oldState = mainWindow->GetState(); mainWindow->SetState(STATE_DISABLED); mainWindow->Append(&promptWindow); mainWindow->ChangeFocus(&promptWindow); @@ -400,7 +401,7 @@ ProgressWindow(char *title, char *msg) HaltGui(); mainWindow->Remove(&promptWindow); - mainWindow->SetState(STATE_DEFAULT); + mainWindow->SetState(oldState); ResumeGui(); } @@ -953,7 +954,8 @@ static int MenuGameSelection() mainWindow->SetState(STATE_DISABLED); if(BrowserLoadFile(GCSettings.LoadMethod)) menu = MENU_EXIT; - mainWindow->SetState(STATE_DEFAULT); + else + mainWindow->SetState(STATE_DEFAULT); } } }