summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouis <louis.braun@gmx.de>2014-10-25 15:08:57 +0200
committerlouis <louis.braun@gmx.de>2014-10-25 15:08:57 +0200
commitee39eb8066f977d2adb3be71b6c34a7d6af4a22c (patch)
tree8c32d8cbbfda8962f9bc6e4447e965583465b0f6
parent1d5a75af58aa2f3ce87a6ae32c357c948b872f0d (diff)
downloadvdr-plugin-skindesigner-ee39eb8066f977d2adb3be71b6c34a7d6af4a22c.tar.gz
vdr-plugin-skindesigner-ee39eb8066f977d2adb3be71b6c34a7d6af4a22c.tar.bz2
fixed a bug if displaydetailedtext is called without correct menucat
-rw-r--r--HISTORY4
-rw-r--r--views/displaymenurootview.c11
2 files changed, 11 insertions, 4 deletions
diff --git a/HISTORY b/HISTORY
index a615fa3..42d102c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -30,4 +30,6 @@ Version 0.0.2
- added extented recording information
- added token {nummenuitem} as number of item for every list, value starts with 1
- fixed bug that x and y of subviews was not respected
-- if a subview is completely not set in a skin, the default menu is used
+- if a subview is completely not set in a skin, the default menu is used
+- fixed a bug if displaydetailedtext is called without correct menucat (mailbox plugin)
+
diff --git a/views/displaymenurootview.c b/views/displaymenurootview.c
index 8bedf18..00fb329 100644
--- a/views/displaymenurootview.c
+++ b/views/displaymenurootview.c
@@ -228,8 +228,14 @@ void cDisplayMenuRootView::SetDetailedViewRecording(const cRecording *recording)
}
void cDisplayMenuRootView::SetDetailedViewText(const char *text) {
- if (!detailView)
- detailView = new cDisplayMenuDetailView(subView);
+ if (!detailView) {
+ if (viewType != svMenuDetailedText) {
+ SetMenu(mcText, true);
+ SetButtonTexts(NULL, NULL, NULL, NULL);
+ } else {
+ detailView = new cDisplayMenuDetailView(subView);
+ }
+ }
detailView->SetText(text);
}
@@ -313,7 +319,6 @@ cFont *cDisplayMenuRootView::GetTextAreaFont(void) {
void cDisplayMenuRootView::Render(void) {
-
if (!view->DrawBackground()) {
if (!defaultBackgroundDrawn) {
defaultBackgroundDrawn = true;