From 5bd0ad2603c5cfe1ac0ab9cadafa1ba6d3aee114 Mon Sep 17 00:00:00 2001 From: louis Date: Thu, 2 Jan 2014 17:20:03 +0100 Subject: [PATCH] fixed uninitialised pixmap --- po/de_DE.po | 2 +- recmenuitem.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/po/de_DE.po b/po/de_DE.po index cc1085b..f21f50f 100755 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -106,7 +106,7 @@ msgid "Timer Timeline" msgstr "Timer Zeitleiste" msgid "Check for Timer Conflicts" -msgstr "Auf Timerkoflikte prüfen" +msgstr "Auf Timerkonflikte prüfen" msgid "Search in Recordings" msgstr "In Aufnahmen suchen" diff --git a/recmenuitem.c b/recmenuitem.c index db10a7c..4e3ba9d 100644 --- a/recmenuitem.c +++ b/recmenuitem.c @@ -2125,15 +2125,15 @@ void cRecMenuItemTimelineHeader::Draw(void) { int xText = (width - font->Width(*header)) / 2; int yText = (height/4 - font->Height())/2; pixmap->DrawText(cPoint(xText, yText), *header, colorText, clrTransparent, font); - - if (timer) { - DrawCurrentTimer(); - } + + DrawCurrentTimer(); } void cRecMenuItemTimelineHeader::DrawCurrentTimer(void) { - int infoHeight = pixmapTimerInfo->ViewPort().Height(); pixmapTimerInfo->Fill(clrTransparent); + if (!timer) + return; + int infoHeight = pixmapTimerInfo->ViewPort().Height(); const cEvent *event = timer->Event(); const cChannel *channel = timer->Channel(); int x = 0;