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

fix crash if Close times out: if DoRequest returns false, it's the thread's job to clean up.

Browse Source 
comment excpetional case in REQ_CLOSE
This commit is contained in:
Glenn Maynard
2005-05-21 01:59:40 +00:00
parent ef77da4cac
commit 23ca7e8f93
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageFileDriverTimeout.cpp
+4 -1
View File
@@ -210,6 +210,8 @@ void ThreadedFileWorker::HandleRequest( int iRequest )
case REQ_CLOSE: case REQ_CLOSE:
ASSERT( m_pRequestFile != NULL ); ASSERT( m_pRequestFile != NULL );
delete m_pRequestFile; delete m_pRequestFile;
/* Clear m_pRequestFile, so RequestTimedOut doesn't double-delete. */
m_pRequestFile = NULL; m_pRequestFile = NULL;
break; break;
@@ -322,7 +324,8 @@ void ThreadedFileWorker::Close( RageFileBasic *pFile )
/* If we're not in a timed-out state, try to wait for the deletion to complete /* If we're not in a timed-out state, try to wait for the deletion to complete
* before continuing. */ * before continuing. */
m_pRequestFile = pFile; m_pRequestFile = pFile;
DoRequest( REQ_CLOSE ); if( !DoRequest(REQ_CLOSE) )
return;
m_pRequestFile = NULL; m_pRequestFile = NULL;
} }
else else