From cc5798a416f48ea4dbf3673a2ea5c5749a9d03a5 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sat, 10 Dec 2005 01:05:58 +0000
Subject: [PATCH] simplify

---
 .../MemoryCard/MemoryCardDriverThreaded_Windows.cpp   | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp
index 442215686a..3c20f6ebcd 100644
--- a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp
+++ b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp
@@ -19,7 +19,7 @@ MemoryCardDriverThreaded_Windows::~MemoryCardDriverThreaded_Windows()
 {
 }
 
-static bool TestReady( const CString &sDrive, CString &sVolumeLabelOut )
+static bool TestReady( const CString &sDrive, UsbStorageDevice *pDevice )
 {
 	TCHAR szVolumeNameBuffer[MAX_PATH];
 	DWORD dwVolumeSerialNumber;
@@ -36,7 +36,7 @@ static bool TestReady( const CString &sDrive, CString &sVolumeLabelOut )
 		&lpFileSystemFlags,
 		szFileSystemNameBuffer,
 		sizeof(szFileSystemNameBuffer) );
-	sVolumeLabelOut = szVolumeNameBuffer;
+	pDevice->sVolumeLabel = szVolumeNameBuffer;
 	return bRet;
 }
 
@@ -107,13 +107,10 @@ bool MemoryCardDriverThreaded_Windows::DoOneUpdate( bool bMount, vector<UsbStora
 				sDrives += ", ";
 			sDrives += sDrive;
 
-			CString sVolumeLabel;
-			if( !TestReady(sDrive, sVolumeLabel) )
-				continue;
-
 			UsbStorageDevice usbd;
+			if( !TestReady(sDrive, &usbd) )
+				continue;
 			usbd.SetOsMountDir( sDrive );
-			usbd.sVolumeLabel = sVolumeLabel;
 			if( TestWrite(sDrive) )
 				usbd.m_State = UsbStorageDevice::STATE_READY;
 			else