summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouis <louis.braun@gmx.de>2015-01-21 18:15:29 +0100
committerlouis <louis.braun@gmx.de>2015-01-21 18:15:29 +0100
commit07fa0e71ef77a8843c6f796cb6a373abce17d728 (patch)
tree5813d15741b0f70180c040109482450de4f6d8ea
parent3a6dced6c1e0f001bda8e45fc4879d361fefb6ed (diff)
downloadvdr-plugin-skindesigner-07fa0e71ef77a8843c6f796cb6a373abce17d728.tar.gz
vdr-plugin-skindesigner-07fa0e71ef77a8843c6f796cb6a373abce17d728.tar.bz2
removed suppression of first DisplayChannel call after VDR start
-rw-r--r--HISTORY2
-rw-r--r--config.h2
-rw-r--r--designer.c1
-rw-r--r--displaychannel.c8
4 files changed, 4 insertions, 9 deletions
diff --git a/HISTORY b/HISTORY
index 85e23b8..c410804 100644
--- a/HISTORY
+++ b/HISTORY
@@ -166,3 +166,5 @@ Version 0.1.4
Version 0.1.5
+- removed suppression of first DisplayChannel call after VDR start
+
diff --git a/config.h b/config.h
index 4f8519e..ac155fc 100644
--- a/config.h
+++ b/config.h
@@ -87,14 +87,12 @@ public:
};
#ifdef DEFINE_CONFIG
- bool firstDisplay = true;
cDesignerConfig config;
cFontManager *fontManager = NULL;
cImageCache *imgCache = NULL;
cTheme Theme;
cRecordingsFolderInfo recFolderInfo(Recordings);
#else
- extern bool firstDisplay;
extern cDesignerConfig config;
extern cFontManager *fontManager;
extern cImageCache *imgCache;
diff --git a/designer.c b/designer.c
index 27108d2..10a9ce7 100644
--- a/designer.c
+++ b/designer.c
@@ -49,7 +49,6 @@ cSkinDisplayMenu *cSkinDesigner::DisplayMenu(void) {
if (!useBackupSkin) {
cSDDisplayMenu *displayMenu = NULL;
Init();
- firstDisplay = false;
displayMenu = new cSDDisplayMenu(menuTemplate);
currentMenu = displayMenu;
return displayMenu;
diff --git a/displaychannel.c b/displaychannel.c
index b7c5ded..540a0c4 100644
--- a/displaychannel.c
+++ b/displaychannel.c
@@ -3,12 +3,8 @@
cSDDisplayChannel::cSDDisplayChannel(cTemplate *channelTemplate, bool WithInfo) {
channelView = NULL;
- if (firstDisplay) {
- firstDisplay = false;
- doOutput = false;
- return;
- } else if (!channelTemplate) {
- esyslog("skindesigner: displayChannel no valid template - aborting");
+
+ if (!channelTemplate) {
doOutput = false;
return;
} else {