zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-12-02 08:52:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: Takedown of an expired HUD message did not properly detach it from the list.

Browse source
This commit is contained in:
Christoph Oelckers 2019-08-09 08:32:23 +02:00
parent d1026e4b5b
commit 8447525019
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/g_statusbar/shared_sbar.cpp
View file

@ -460,6 +460,7 @@ void DBaseStatusBar::OnDestroy ()
while (msg) while (msg)
{ {
DHUDMessageBase *next = msg->Next; DHUDMessageBase *next = msg->Next;
msg->Next = nullptr;
msg->Destroy(); msg->Destroy();
msg = next; msg = next;
} }
@ -745,7 +746,6 @@ void DBaseStatusBar::Tick ()
for (size_t i = 0; i < countof(Messages); ++i) for (size_t i = 0; i < countof(Messages); ++i)
{ {
DHUDMessageBase *msg = Messages[i]; DHUDMessageBase *msg = Messages[i];
TObjPtr<DHUDMessageBase *>*prev = &Messages[i];
while (msg) while (msg)
{ {
@ -753,13 +753,9 @@ void DBaseStatusBar::Tick ()
if (msg->CallTick ()) if (msg->CallTick ())
{ {
*prev = next; DetachMessage(msg);
msg->Destroy(); msg->Destroy();
} }
else
{
prev = &msg->Next;
}
msg = next; msg = next;
} }