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

Integrate C++11 branch into 5_1-new

Browse Source
This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/RageUtil_WorkerThread.cpp
+1 -1
View File
@@ -115,7 +115,7 @@ void RageWorkerThread::WorkerMain()
m_WorkerEvent.Lock();
while( m_iRequest == REQ_NONE && !bTimeToRunHeartbeat )
{
if( !m_WorkerEvent.Wait( m_fHeartbeat != -1? &m_NextHeartbeat:NULL ) )
if( !m_WorkerEvent.Wait( m_fHeartbeat != -1? &m_NextHeartbeat:nullptr ) )
bTimeToRunHeartbeat = true;
}
const int iRequest = m_iRequest;