1.1 --- a/core/TimerSys.cpp	Wed Mar 14 07:54:54 2007 +0000
     1.2 +++ b/core/TimerSys.cpp	Wed Mar 14 11:34:03 2007 +0000
     1.3 @@ -44,10 +44,7 @@
     1.4  		{
     1.5  			pTimer->m_InExec = true;
     1.6  			pTimer->m_Listener->OnTimer(pTimer, pTimer->m_pData);
     1.7 -			if (pTimer->m_KillMe)
     1.8 -			{
     1.9 -				pTimer->m_Listener->OnTimerEnd(pTimer, pTimer->m_pData);
    1.10 -			}
    1.11 +			pTimer->m_Listener->OnTimerEnd(pTimer, pTimer->m_pData);
    1.12  			iter = m_SingleTimers.erase(iter);
    1.13  			m_FreeTimers.push(pTimer);
    1.14  		} else {
    1.15 @@ -144,9 +141,12 @@
    1.16  		m_SingleTimers.remove(pTimer);
    1.17  		m_FreeTimers.push(pTimer);
    1.18  	} else {
    1.19 -		if (delayExec && (res != Pl_Stop) && !pTimer->m_KillMe)
    1.20 +		if ((res != Pl_Stop) && !pTimer->m_KillMe)
    1.21  		{
    1.22 -			pTimer->m_ToExec = gpGlobals->curtime + pTimer->m_Interval;
    1.23 +			if (delayExec)
    1.24 +			{
    1.25 +				pTimer->m_ToExec = gpGlobals->curtime + pTimer->m_Interval;
    1.26 +			}
    1.27  			pTimer->m_InExec = false;
    1.28  			return;
    1.29  		}