From ffc5189e7b2227e1cba303fe9fc4f2a0d1f9bf89 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 4 May 2005 20:49:37 +0000 Subject: [PATCH] cleanup, silence warning --- stepmania/src/RageUtil_WorkerThread.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stepmania/src/RageUtil_WorkerThread.cpp b/stepmania/src/RageUtil_WorkerThread.cpp index cceb56388e..d9a9cdb83f 100644 --- a/stepmania/src/RageUtil_WorkerThread.cpp +++ b/stepmania/src/RageUtil_WorkerThread.cpp @@ -70,7 +70,7 @@ bool WorkerThread::DoRequest( int iRequest ) ASSERT( !m_bTimedOut ); ASSERT( m_iRequest == REQ_NONE ); - if( m_Timeout.IsZero() ) + if( m_Timeout.IsZero() && iRequest != REQ_SHUTDOWN ) LOG->Warn( "Request made with timeout disabled (%s, iRequest = %i)", m_sName.c_str(), iRequest ); /* Set the request, and wake up the worker thread. */ @@ -113,7 +113,7 @@ void WorkerThread::WorkerMain() { bool bTimeToRunHeartbeat = false; m_WorkerEvent.Lock(); - while( m_iRequest == REQ_NONE && !bTimeToRunHeartbeat ) //&& m_apDeletedFiles.empty() ) + while( m_iRequest == REQ_NONE && !bTimeToRunHeartbeat ) { if( !m_WorkerEvent.Wait( m_fHeartbeat != -1? &m_NextHeartbeat:NULL ) ) bTimeToRunHeartbeat = true;