From 3f27a018b3982c30b1434ca044c206ffbb70e526 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sat, 10 Dec 2005 01:42:49 +0000
Subject: [PATCH] nudge closer to Windows driver

---
 .../MemoryCardDriverThreaded_Linux.cpp           | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp
index 863adc3e16..a64e987b8a 100644
--- a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp
+++ b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp
@@ -167,16 +167,15 @@ bool MemoryCardDriverThreaded_Linux::DoOneUpdate( bool bMount, vector<UsbStorage
 
 	vector<UsbStorageDevice> vOld = m_vDevicesLastSeen; // copy
 	GetUSBStorageDevices( vStorageDevicesOut );
-	vector<UsbStorageDevice> &vNew = vStorageDevicesOut;
-	
-	// check for connects
+
+	// log connects
 	FOREACH( UsbStorageDevice, vNew, newd )
 	{
 		vector<UsbStorageDevice>::iterator iter = find( vOld.begin(), vOld.end(), *newd );
 		if( iter == vOld.end() )    // didn't find
 			LOG->Trace( "New device connected: %s", newd->sDevice.c_str() );
 	}
-	
+
 	/* When we first see a device, regardless of bMount, just return it as CHECKING,
 	 * so the main thread knows about the device.  On the next call where bMount is
 	 * true, check it. */
@@ -206,8 +205,7 @@ bool MemoryCardDriverThreaded_Linux::DoOneUpdate( bool bMount, vector<UsbStorage
 		{
 			if( !bMount )
 			{
-				/* We can't check it now.  Keep the checking state and check it when
-				 * we can. */
+				/* We can't check it now.  Keep STATE_CHECKING, and check it when we can. */
 				d.m_State = UsbStorageDevice::STATE_CHECKING;
 				continue;
 			}
@@ -239,9 +237,9 @@ bool MemoryCardDriverThreaded_Linux::DoOneUpdate( bool bMount, vector<UsbStorage
 			LOG->Trace( "WriteTest: %s, Name: %s", d.m_State == UsbStorageDevice::STATE_ERROR? "failed":"succeeded", d.sName.c_str() );
 		}
 	}
-	
-	m_vDevicesLastSeen = vNew;
-	
+
+	m_vDevicesLastSeen = vStorageDevicesOut;
+
 	return true;
 }