From 129999e39f973b7af5ae55b59da4a69d5079da89 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Sun, 24 Nov 2019 07:03:53 +1100 Subject: [PATCH] Fix old announcement showing for one frame when changing texture pack (Thanks goodly) --- src/Screens.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Screens.c b/src/Screens.c index 7157e3351..edf30396d 100644 --- a/src/Screens.c +++ b/src/Screens.c @@ -538,17 +538,19 @@ static void ChatScreen_DrawChat(struct ChatScreen* s, double delta) { } } + /* Destroy announcement texture before even rendering it at all, */ + /* otherwise changing texture pack shows announcement for one frame */ + if (s->announcement.tex.ID && now > Chat_AnnouncementReceived + (5 * 1000)) { + Elem_TryFree(&s->announcement); + } Elem_Render(&s->announcement, delta); + if (s->grabsInput) { Elem_Render(&s->input.base, delta); if (s->altText.active) { Elem_Render(&s->altText, delta); } } - - if (s->announcement.tex.ID && now > Chat_AnnouncementReceived + (5 * 1000)) { - Elem_TryFree(&s->announcement); - } } static void ChatScreen_TabEntryAdded(void* screen, int id) {