From 5ce5dc5060c68aebbd89ef1c2ee97220e3ab0ec3 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sat, 24 Dec 2005 02:32:55 +0000
Subject: [PATCH] simplify

---
 .../arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp
index 88bcf1368a..d13ae5e303 100644
--- a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp
+++ b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp
@@ -49,11 +49,11 @@ bool MemoryCardDriverThreaded_Windows::TestWrite( UsbStorageDevice* pDevice )
 	return true;
 }
 
-static bool IsFloppyDrive( char c )
+static bool IsFloppyDrive( const CString &sDrive )
 {
 	char szBuf[1024];
 
-	QueryDosDevice( ssprintf("%c:", c), szBuf, 1024 );
+	QueryDosDevice( sDrive, szBuf, 1024 );
 
 	char *p = szBuf;
 	while( *p )
@@ -77,10 +77,11 @@ void MemoryCardDriverThreaded_Windows::GetUSBStorageDevices( vector<UsbStorageDe
 		DWORD mask = (1 << i);
 		if( !(m_dwLastLogicalDrives & mask) )
 			continue; // drive letter is invalid
-		if( IsFloppyDrive((char)i+'a') )
-			continue;
 
 		CString sDrive = ssprintf( "%c:", 'a'+i%26 );
+		if( IsFloppyDrive(sDrive) )
+			continue;
+
 		if( GetDriveType(sDrive + "\\") != DRIVE_REMOVABLE )	// is a removable drive
 			continue;