Skip to content

Commit 7da95ed

Browse files
authored
Merge pull request #315 from Wikot235/Fix-Flare-Issue
Fixed issue #314 (Env_flare crash)
2 parents b51c5c3 + 4f14f0c commit 7da95ed

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

sp/src/game/server/hl2/weapon_flaregun.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -568,10 +568,13 @@ void CFlare::Start( float lifeTime )
568568
//-----------------------------------------------------------------------------
569569
void CFlare::Die( float fadeTime )
570570
{
571-
m_flTimeBurnOut = gpGlobals->curtime + fadeTime;
571+
if (m_bInActiveList)
572+
{
573+
m_flTimeBurnOut = gpGlobals->curtime + fadeTime;
572574

573-
SetThink( &CFlare::FlareThink );
574-
SetNextThink( gpGlobals->curtime + 0.1f );
575+
SetThink(&CFlare::FlareThink);
576+
SetNextThink(gpGlobals->curtime + 0.1f);
577+
}
575578
}
576579

577580
//-----------------------------------------------------------------------------

0 commit comments

Comments
 (0)