Skip to content

Fix CancelPending input causing a crash when a logic_relay fires this to itself #1632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix CancelPending input causing a crash when a logic_relay fires this to itself #1632

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c59cbd
Fix cancelpending causing a crash when a logic_relay fires this to it…
WereTech Nov 7, 2025
7f886ff
add warning message if logic relay is attempting to cancelpending itself
WereTech Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/game/server/logicrelay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,15 @@ void CLogicRelay::InputEnableRefire( inputdata_t &inputdata )
//------------------------------------------------------------------------------
void CLogicRelay::InputCancelPending( inputdata_t &inputdata )
{
g_EventQueue.CancelEvents( this );
// We don't want to allow the logic relay to cancelpending itself. This will eventually lead to a crash!
if ( inputdata.pCaller != this )
{
g_EventQueue.CancelEvents( this );
}
else
{
Warning("Entity %s - (%s) is attempting to CancelPending itself. This is not allowed!\n", this->GetEntityName(), this->GetClassname());
}

// Stop waiting; allow another Trigger.
m_bWaitForRefire = false;
Expand Down