From f89c95be3bf34b6a24b83ee6b5ba2ec499160004 Mon Sep 17 00:00:00 2001 From: louis Date: Sat, 15 Nov 2014 09:50:39 +0100 Subject: fixed crash when clearing a message in displaychannel and displayreplay --- HISTORY | 1 + views/displaychannelview.c | 1 + views/displayreplayview.c | 1 + 3 files changed, 3 insertions(+) diff --git a/HISTORY b/HISTORY index 0732c88..0faf378 100644 --- a/HISTORY +++ b/HISTORY @@ -57,4 +57,5 @@ Version 0.0.3 - added tokens {month}, {monthname} and {year} in displaymenutimers listitem and currentitem - added dedicated tokens for posters and banners in in displaychannel and displayreplay - added Plugin Interface +- fixed crash when clearing a message in displaychannel and displayreplay diff --git a/views/displaychannelview.c b/views/displaychannelview.c index 626658f..0c0d8fd 100644 --- a/views/displaychannelview.c +++ b/views/displaychannelview.c @@ -515,6 +515,7 @@ string cDisplayChannelView::GetChannelSep(const cChannel *channel, bool prev) { void cDisplayChannelView::DisplayMessage(eMessageType Type, const char *Text) { if (!Text) { ClearViewElement(veMessage); + return; } map < string, string > stringTokens; diff --git a/views/displayreplayview.c b/views/displayreplayview.c index 5777590..680eea6 100644 --- a/views/displayreplayview.c +++ b/views/displayreplayview.c @@ -352,6 +352,7 @@ void cDisplayReplayView::DrawJump(const char *jump) { void cDisplayReplayView::DrawMessage(eMessageType type, const char *text) { if (!text) { ClearViewElement(veMessage); + return; } map < string, string > stringTokens; -- cgit v1.2.3