From 88023a04db251308929fe492a37885d072060bdb Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 21 Apr 2005 06:36:30 +0000 Subject: [PATCH] fix card state lost when another card updates --- .../arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp index 0ec49972b2..05d2a03d04 100644 --- a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp +++ b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp @@ -205,9 +205,12 @@ bool MemoryCardDriverThreaded_Linux::DoOneUpdate( bool bMount, vectorm_State == UsbStorageDevice::STATE_CHECKING ) + /* Preserve the state of the device. */ + d.m_State = iter->m_State; + + /* The device was here last time. If CHECKING, check the device now if + * we're allowed to. */ + if( d.m_State == UsbStorageDevice::STATE_CHECKING ) { if( !bMount ) { @@ -323,7 +326,6 @@ void GetNewStorageDevices( vector& vDevicesOut ) UsbStorageDevice usbd; CString sPath = sBlockDevicePath + asDevices[i] + "/"; - LOG->Trace("'%s'", sPath.c_str()); /* Ignore non-removable devices. */ CString sBuf;