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

error handling/reporting fixes

Browse Source
This commit is contained in:
Glenn Maynard
2005-05-23 22:23:24 +00:00
parent a9cd1c89a8
commit c167840888
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageFileDriverTimeout.cpp
+10
View File
@@ -393,6 +393,8 @@ int ThreadedFileWorker::Seek( RageFileBasic *&pFile, int iPos, CString &sError )
return -1; return -1;
} }
if( m_iResultRequest == -1 )
sError = m_sResultError;
m_pRequestFile = NULL; m_pRequestFile = NULL;
return m_iResultRequest; return m_iResultRequest;
@@ -428,6 +430,9 @@ int ThreadedFileWorker::Read( RageFileBasic *&pFile, void *pBuf, int iSize, CStr
} }
int iGot = m_iResultRequest; int iGot = m_iResultRequest;
if( iGot == -1 )
sError = m_sResultError;
else
memcpy( pBuf, m_pResultBuffer, iGot ); memcpy( pBuf, m_pResultBuffer, iGot );
m_pRequestFile = NULL; m_pRequestFile = NULL;
@@ -468,6 +473,8 @@ int ThreadedFileWorker::Write( RageFileBasic *&pFile, const void *pBuf, int iSiz
} }
int iGot = m_iResultRequest; int iGot = m_iResultRequest;
if( m_iResultRequest == -1 )
sError = m_sResultError;
m_pRequestFile = NULL; m_pRequestFile = NULL;
delete [] m_pRequestBuffer; delete [] m_pRequestBuffer;
@@ -503,6 +510,9 @@ int ThreadedFileWorker::Flush( RageFileBasic *&pFile, CString &sError )
return -1; return -1;
} }
if( m_iResultRequest == -1 )
sError = m_sResultError;
m_pRequestFile = NULL; m_pRequestFile = NULL;
return m_iResultRequest; return m_iResultRequest;