actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2005-12-24 02:32:55 +00:00
parent a5042f126c
commit 5ce5dc5060
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp
+5 -4
View File
@@ -49,11 +49,11 @@ bool MemoryCardDriverThreaded_Windows::TestWrite( UsbStorageDevice* pDevice )
return true; return true;
} }
static bool IsFloppyDrive( char c ) static bool IsFloppyDrive( const CString &sDrive )
{ {
char szBuf[1024]; char szBuf[1024];
QueryDosDevice( ssprintf("%c:", c), szBuf, 1024 ); QueryDosDevice( sDrive, szBuf, 1024 );
char *p = szBuf; char *p = szBuf;
while( *p ) while( *p )
@@ -77,10 +77,11 @@ void MemoryCardDriverThreaded_Windows::GetUSBStorageDevices( vector<UsbStorageDe
DWORD mask = (1 << i); DWORD mask = (1 << i);
if( !(m_dwLastLogicalDrives & mask) ) if( !(m_dwLastLogicalDrives & mask) )
continue; // drive letter is invalid continue; // drive letter is invalid
if( IsFloppyDrive((char)i+'a') )
continue;
CString sDrive = ssprintf( "%c:", 'a'+i%26 ); CString sDrive = ssprintf( "%c:", 'a'+i%26 );
if( IsFloppyDrive(sDrive) )
continue;
if( GetDriveType(sDrive + "\\") != DRIVE_REMOVABLE ) // is a removable drive if( GetDriveType(sDrive + "\\") != DRIVE_REMOVABLE ) // is a removable drive
continue; continue;