Skip to content

Commit 3386efc

Browse files
committed
Do not allow DeleteTemporaryTimers/Aliases/Triggers delete one that is executing a script
1 parent 9151f01 commit 3386efc

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

scripting/methods/methods_aliases.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ CAlias * alias_item;
483483
for (pos = GetAliasMap ().GetStartPosition(); pos; )
484484
{
485485
GetAliasMap ().GetNextAssoc (pos, strAliasName, alias_item);
486-
if (alias_item->bTemporary)
486+
if (alias_item->bTemporary && !alias_item->bExecutingScript)
487487
{
488488
delete alias_item;
489489
GetAliasMap ().RemoveKey (strAliasName);

scripting/methods/methods_timers.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ CTimer * timer_item;
555555
for (pos = GetTimerMap ().GetStartPosition(); pos; )
556556
{
557557
GetTimerMap ().GetNextAssoc (pos, strTimerName, timer_item);
558-
if (timer_item->bTemporary)
558+
if (timer_item->bTemporary && !timer_item->bExecutingScript)
559559
{
560560
delete timer_item;
561561
GetTimerMap ().RemoveKey (strTimerName);

scripting/methods/methods_triggers.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ CTrigger * trigger_item;
545545
for (pos = GetTriggerMap ().GetStartPosition(); pos; )
546546
{
547547
GetTriggerMap ().GetNextAssoc (pos, strTriggerName, trigger_item);
548-
if (trigger_item->bTemporary)
548+
if (trigger_item->bTemporary && !trigger_item->bExecutingScript)
549549
{
550550
delete trigger_item;
551551
GetTriggerMap ().RemoveKey (strTriggerName);

0 commit comments

Comments
 (0)