mirror of
https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git
synced 2023-10-19 17:58:31 +02:00
removed suppression of first DisplayChannel call after VDR start
This commit is contained in:
parent
3a6dced6c1
commit
07fa0e71ef
2
HISTORY
2
HISTORY
@ -166,3 +166,5 @@ Version 0.1.4
|
|||||||
|
|
||||||
Version 0.1.5
|
Version 0.1.5
|
||||||
|
|
||||||
|
- removed suppression of first DisplayChannel call after VDR start
|
||||||
|
|
||||||
|
2
config.h
2
config.h
@ -87,14 +87,12 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
#ifdef DEFINE_CONFIG
|
#ifdef DEFINE_CONFIG
|
||||||
bool firstDisplay = true;
|
|
||||||
cDesignerConfig config;
|
cDesignerConfig config;
|
||||||
cFontManager *fontManager = NULL;
|
cFontManager *fontManager = NULL;
|
||||||
cImageCache *imgCache = NULL;
|
cImageCache *imgCache = NULL;
|
||||||
cTheme Theme;
|
cTheme Theme;
|
||||||
cRecordingsFolderInfo recFolderInfo(Recordings);
|
cRecordingsFolderInfo recFolderInfo(Recordings);
|
||||||
#else
|
#else
|
||||||
extern bool firstDisplay;
|
|
||||||
extern cDesignerConfig config;
|
extern cDesignerConfig config;
|
||||||
extern cFontManager *fontManager;
|
extern cFontManager *fontManager;
|
||||||
extern cImageCache *imgCache;
|
extern cImageCache *imgCache;
|
||||||
|
@ -49,7 +49,6 @@ cSkinDisplayMenu *cSkinDesigner::DisplayMenu(void) {
|
|||||||
if (!useBackupSkin) {
|
if (!useBackupSkin) {
|
||||||
cSDDisplayMenu *displayMenu = NULL;
|
cSDDisplayMenu *displayMenu = NULL;
|
||||||
Init();
|
Init();
|
||||||
firstDisplay = false;
|
|
||||||
displayMenu = new cSDDisplayMenu(menuTemplate);
|
displayMenu = new cSDDisplayMenu(menuTemplate);
|
||||||
currentMenu = displayMenu;
|
currentMenu = displayMenu;
|
||||||
return displayMenu;
|
return displayMenu;
|
||||||
|
@ -3,12 +3,8 @@
|
|||||||
|
|
||||||
cSDDisplayChannel::cSDDisplayChannel(cTemplate *channelTemplate, bool WithInfo) {
|
cSDDisplayChannel::cSDDisplayChannel(cTemplate *channelTemplate, bool WithInfo) {
|
||||||
channelView = NULL;
|
channelView = NULL;
|
||||||
if (firstDisplay) {
|
|
||||||
firstDisplay = false;
|
if (!channelTemplate) {
|
||||||
doOutput = false;
|
|
||||||
return;
|
|
||||||
} else if (!channelTemplate) {
|
|
||||||
esyslog("skindesigner: displayChannel no valid template - aborting");
|
|
||||||
doOutput = false;
|
doOutput = false;
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
Reference in New Issue
Block a user