fix windows compile
This commit is contained in:
@@ -68,11 +68,7 @@ void MemoryCardDriverThreaded_Windows::MountThreadDoOneUpdate()
|
|||||||
{
|
{
|
||||||
DWORD dwNewLogicalDrives = ::GetLogicalDrives();
|
DWORD dwNewLogicalDrives = ::GetLogicalDrives();
|
||||||
|
|
||||||
if( m_bForceRedetectNextUpdate )
|
if( dwNewLogicalDrives == m_dwLastLogicalDrives )
|
||||||
{
|
|
||||||
m_bForceRedetectNextUpdate = false;
|
|
||||||
}
|
|
||||||
else if( dwNewLogicalDrives == m_dwLastLogicalDrives )
|
|
||||||
{
|
{
|
||||||
// no change from last update
|
// no change from last update
|
||||||
usleep( 50000 );
|
usleep( 50000 );
|
||||||
@@ -80,7 +76,7 @@ void MemoryCardDriverThreaded_Windows::MountThreadDoOneUpdate()
|
|||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
vector<UsbStorageDeviceEx> vNewStorageDevices;
|
vector<UsbStorageDevice> vNewStorageDevices;
|
||||||
|
|
||||||
const int MAX_DRIVES = 26;
|
const int MAX_DRIVES = 26;
|
||||||
for( int i=2; i<MAX_DRIVES; i++ ) // skip 'a:" and "b:"
|
for( int i=2; i<MAX_DRIVES; i++ ) // skip 'a:" and "b:"
|
||||||
@@ -98,13 +94,9 @@ void MemoryCardDriverThreaded_Windows::MountThreadDoOneUpdate()
|
|||||||
if( !TestReady(sDrive) )
|
if( !TestReady(sDrive) )
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
UsbStorageDeviceEx usbd;
|
UsbStorageDevice usbd;
|
||||||
usbd.sOsMountDir = sDrive;
|
usbd.sOsMountDir = sDrive;
|
||||||
|
|
||||||
if( ShouldDoOsMount() )
|
|
||||||
{
|
|
||||||
usbd.bWriteTestSucceeded = TestWrite( sDrive );
|
usbd.bWriteTestSucceeded = TestWrite( sDrive );
|
||||||
|
|
||||||
// read name
|
// read name
|
||||||
this->Mount( &usbd, TEMP_MOUNT_POINT );
|
this->Mount( &usbd, TEMP_MOUNT_POINT );
|
||||||
FILEMAN->FlushDirCache( TEMP_MOUNT_POINT );
|
FILEMAN->FlushDirCache( TEMP_MOUNT_POINT );
|
||||||
@@ -113,7 +105,6 @@ void MemoryCardDriverThreaded_Windows::MountThreadDoOneUpdate()
|
|||||||
profile.LoadEditableDataFromDir( sProfileDir );
|
profile.LoadEditableDataFromDir( sProfileDir );
|
||||||
usbd.sName = profile.GetDisplayName();
|
usbd.sName = profile.GetDisplayName();
|
||||||
UnmountMountPoint( TEMP_MOUNT_POINT );
|
UnmountMountPoint( TEMP_MOUNT_POINT );
|
||||||
}
|
|
||||||
|
|
||||||
vNewStorageDevices.push_back( usbd );
|
vNewStorageDevices.push_back( usbd );
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user