From f8a00af09f4e96523c6e466370293dc904b2771b Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Fri, 28 Jan 2005 00:08:16 +0000
Subject: [PATCH] MemoryCardManager::TryMountAllCards gone

---
 stepmania/src/GameCommand.cpp       | 15 ++++++++++-----
 stepmania/src/MemoryCardManager.cpp | 14 --------------
 stepmania/src/MemoryCardManager.h   |  1 -
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/stepmania/src/GameCommand.cpp b/stepmania/src/GameCommand.cpp
index 30b64b1c62..ddd1cb0eac 100644
--- a/stepmania/src/GameCommand.cpp
+++ b/stepmania/src/GameCommand.cpp
@@ -627,20 +627,23 @@ void GameCommand::Apply( const vector<PlayerNumber> &vpns ) const
 	}
 	if( m_bTransferStatsFromMachine )
 	{
-		MEMCARDMAN->TryMountAllCards();
-
 		bool bTriedToSave = false;
 		FOREACH_PlayerNumber( pn )
 		{
 			if( MEMCARDMAN->GetCardState(pn) != MEMORY_CARD_STATE_READY )
 				continue;	// skip
 
+			MEMCARDMAN->MountUsedCard(pn);
+
 			bTriedToSave = true;
 
 			CString sDir = MEM_CARD_MOUNT_POINT[pn];
 			sDir += "MachineProfile/";
 
 			bool bSaved = PROFILEMAN->GetMachineProfile()->SaveAllToDir( sDir, PREFSMAN->m_bSignProfileData );
+
+			MEMCARDMAN->UnmountCard(pn);
+
 			if( bSaved )
 				SCREENMAN->SystemMessage( ssprintf("Machine stats saved to P%d card.",pn+1) );
 			else
@@ -655,14 +658,14 @@ void GameCommand::Apply( const vector<PlayerNumber> &vpns ) const
 	}
 	if( m_bTransferStatsToMachine )
 	{
-		MEMCARDMAN->TryMountAllCards();
-
 		bool bTriedToLoad = false;
 		FOREACH_PlayerNumber( pn )
 		{
 			if( MEMCARDMAN->GetCardState(pn) != MEMORY_CARD_STATE_READY )
 				continue;	// skip
 
+			MEMCARDMAN->MountUsedCard(pn);
+
 			bTriedToLoad = true;
 
 			CString sDir = MEM_CARD_MOUNT_POINT[pn];
@@ -681,12 +684,14 @@ void GameCommand::Apply( const vector<PlayerNumber> &vpns ) const
 				*PROFILEMAN->GetMachineProfile() = backup;
 				break;
 			case Profile::failed_tampered:
-				SCREENMAN->SystemMessage( ssprintf("The profile on P%d card contains tampered data.",pn+1) );
+				SCREENMAN->SystemMessage( ssprintf("The profile on P%d card contains corrupt or tampered data.",pn+1) );
 				*PROFILEMAN->GetMachineProfile() = backup;
 				break;
 			default:
 				ASSERT(0);
 			}
+
+			MEMCARDMAN->UnmountCard(pn);
 			break;
 		}
 
diff --git a/stepmania/src/MemoryCardManager.cpp b/stepmania/src/MemoryCardManager.cpp
index 00f0163c60..8484d2c6d4 100644
--- a/stepmania/src/MemoryCardManager.cpp
+++ b/stepmania/src/MemoryCardManager.cpp
@@ -233,20 +233,6 @@ void MemoryCardManager::UnlockCards()
 	m_pDriver->SetMountThreadState( MemoryCardDriver::detect_and_mount );
 }
 
-
-/* Used by TransferStatsFromMachine, TransferStatsToMachine, and PlayersFinalized()
- * just before reading the profile.  Should block. */
-void MemoryCardManager::TryMountAllCards()
-{
-	FOREACH_EnabledPlayer( p )
-	{
-		if( m_Device[p].IsBlank() )	// they don't have an assigned card
-			continue;
-		
-		MountCard( p );
-	}
-}
-
 /* Called in EndGame just before writing the profile.  Should block. */
 void MemoryCardManager::MountUsedCard( PlayerNumber pn )
 {
diff --git a/stepmania/src/MemoryCardManager.h b/stepmania/src/MemoryCardManager.h
index 42fd456403..790b321725 100644
--- a/stepmania/src/MemoryCardManager.h
+++ b/stepmania/src/MemoryCardManager.h
@@ -21,7 +21,6 @@ public:
 	
 	void LockCards();	// prevent removing or changing of memory cards
 	void UnlockCards();
-	void TryMountAllCards();
 	void MountUsedCard( PlayerNumber pn );
 	void MountCard( PlayerNumber pn );
 	void UnmountCard( PlayerNumber pn );