From 4c0a55a295f80543505e3e4f3a7f038d93f4e9b6 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 7 Feb 2005 03:39:51 +0000 Subject: [PATCH] when we MountCard, we must always UnmountCard disable FlushAndReset. It doesn't fit well with the timeout scheme: we have separate timeouts, but FlushAndReset is global. I could enable the timeout separately for this, but the mount -o remount should probably just be part of Unmount and we don't have to reload usb-storage anymore ... --- stepmania/src/GameState.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index a454431e3a..64e5965797 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -359,10 +359,12 @@ void GameState::EndGame() if( !PROFILEMAN->IsUsingProfile(pn) ) continue; - if( PROFILEMAN->ProfileWasLoadedFromMemoryCard(pn) ) + bool bWasMemoryCard = PROFILEMAN->ProfileWasLoadedFromMemoryCard(pn); + if( bWasMemoryCard ) MEMCARDMAN->MountCard( pn ); PROFILEMAN->SaveProfile( pn ); - MEMCARDMAN->UnmountCard( pn ); + if( bWasMemoryCard ) + MEMCARDMAN->UnmountCard( pn ); PROFILEMAN->UnloadProfile( pn ); } @@ -371,7 +373,7 @@ void GameState::EndGame() // Reset the USB storage device numbers -after- saving CHECKPOINT; - MEMCARDMAN->FlushAndReset(); +// MEMCARDMAN->FlushAndReset(); CHECKPOINT; SONGMAN->FreeAllLoadedFromProfiles();