fixed a bug that some recmenuitems are not redrawn

2 files changed, 16 insertions, 23 deletions

diff --git a/imagecache.c b/imagecache.c
index 5c4c50a..25d2662 100644
--- a/imagecache.c
+++ b/imagecache.c
@@ -426,7 +426,6 @@ cImage *cImageCache::CreateGrid(int width, int height, bool active) {
     tColor *imgData = (tColor *)image->Data();

     if (w != width || h != height) {

         ImageScaler scaler;

-        //esyslog("tvguide: imagescaler parameters: width %d, height %d, w %d, h %d", width, height, w, h);

         scaler.SetImageParameters(imgData, width, width, height, w, h);

         for (const void *pixels_end = &pixels[w*h]; pixels < pixels_end; ++pixels)

             scaler.PutSourcePixel(pixels->blue / ((MaxRGB + 1) / 256),

diff --git a/recmenuitem.c b/recmenuitem.c
index 24a0166..5ad06ca 100644
--- a/recmenuitem.c
+++ b/recmenuitem.c
@@ -2564,22 +2564,19 @@ void cRecMenuItemSearchTimer::SetPixmaps(void) {
 
 void cRecMenuItemSearchTimer::Draw(void) {
     int textX = DrawIcons();
-    if (!drawn) {
-        pixmapText->Fill(clrTransparent);
-        textX += 20;
-        cString label;
-        if (timer.Active()) {
-            label = cString::sprintf("\"%s\"", timer.SearchString().c_str());
-        } else {
-            label = cString::sprintf("\"%s\" (%s)", timer.SearchString().c_str(), tr("inactive"));
-        }
-        int numTimersActive = timer.GetNumTimers();
-        int numRecordings = timer.GetNumRecordings();
-        cString info = cString::sprintf("%s: %d, %s: %d", tr("active timers"), numTimersActive, tr("recordings done"), numRecordings);
-        pixmapText->DrawText(cPoint(textX, 5 + (height/2 - font->Height())/2), *label, colorText, clrTransparent, font);
-        pixmapText->DrawText(cPoint(textX, height/2 + (height/2 - fontSmall->Height())/2), *info, colorText, clrTransparent, fontSmall);
-        drawn = true;
+    pixmapText->Fill(clrTransparent);
+    textX += 20;
+    cString label;
+    if (timer.Active()) {
+        label = cString::sprintf("\"%s\"", timer.SearchString().c_str());
+    } else {
+        label = cString::sprintf("\"%s\" (%s)", timer.SearchString().c_str(), tr("inactive"));
     }
+    int numTimersActive = timer.GetNumTimers();
+    int numRecordings = timer.GetNumRecordings();
+    cString info = cString::sprintf("%s: %d, %s: %d", tr("active timers"), numTimersActive, tr("recordings done"), numRecordings);
+    pixmapText->DrawText(cPoint(textX, 5 + (height/2 - font->Height())/2), *label, colorText, clrTransparent, font);
+    pixmapText->DrawText(cPoint(textX, height/2 + (height/2 - fontSmall->Height())/2), *info, colorText, clrTransparent, fontSmall);
 }
 
 void cRecMenuItemSearchTimer::Hide(void) { 
@@ -2693,13 +2690,10 @@ void cRecMenuItemFavorite::SetPixmaps(void) {
 
 void cRecMenuItemFavorite::Draw(void) {
     int textX = DrawIcons();
-    if (!drawn) {
-        pixmapText->Fill(clrTransparent);
-        textX += 20;
-        cString label = cString::sprintf("\"%s\"", favorite.SearchString().c_str());
-        pixmapText->DrawText(cPoint(textX, (height - fontLarge->Height())/2), *label, colorText, clrTransparent, fontLarge);
-        drawn = true;
-    }
+    pixmapText->Fill(clrTransparent);
+    textX += 20;
+    cString label = cString::sprintf("\"%s\"", favorite.SearchString().c_str());
+    pixmapText->DrawText(cPoint(textX, (height - fontLarge->Height())/2), *label, colorText, clrTransparent, fontLarge);
 }
 
 void cRecMenuItemFavorite::Hide(void) {