summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--displaymenu.c39
1 files changed, 20 insertions, 19 deletions
diff --git a/displaymenu.c b/displaymenu.c
index 412612f..00156c5 100644
--- a/displaymenu.c
+++ b/displaymenu.c
@@ -31,7 +31,7 @@ cNopacityDisplayMenu::cNopacityDisplayMenu(void) : cThread("DisplayMenu") {
}
cNopacityDisplayMenu::~cNopacityDisplayMenu(void) {
- if (osd && menuFadeOutTime) {
+ if (osd && (MenuCategory() != mcPluginSetup) && (MenuCategory() != mcSetupPlugins) && menuFadeOutTime) {
fadeout = true;
Start();
}
@@ -223,23 +223,24 @@ void cNopacityDisplayMenu::SetMenuCategory(eMenuCategory MenuCategory) {
8 mcTimerEdit,
9 mcRecording,
10 mcRecordingInfo,
- 11 mcPlugin,
- 12 mcPluginSetup,
- 13 mcSetup,
- 14 mcSetupOsd,
- 15 mcSetupEpg,
- 16 mcSetupDvb,
- 17 mcSetupLnb,
- 18 mcSetupCam,
- 19 mcSetupRecord,
- 20 mcSetupReplay,
- 21 mcSetupMisc,
- 22 mcSetupPlugins,
- 23 mcCommand,
- 24 mcEvent,
- 25 mcText,
- 26 mcFolder,
- 27 mcCam
+ 11 mcRecordingEdit,
+ 12 mcPlugin,
+ 13 mcPluginSetup,
+ 14 mcSetup,
+ 15 mcSetupOsd,
+ 16 mcSetupEpg,
+ 17 mcSetupDvb,
+ 18 mcSetupLnb,
+ 19 mcSetupCam,
+ 20 mcSetupRecord,
+ 21 mcSetupReplay,
+ 22 mcSetupMisc,
+ 23 mcSetupPlugins,
+ 24 mcCommand,
+ 25 mcEvent,
+ 26 mcText,
+ 27 mcFolder,
+ 28 mcCam
*/
menuCategoryLast = this->MenuCategory();
cSkinDisplayMenu::SetMenuCategory(MenuCategory);
@@ -645,7 +646,7 @@ void cNopacityDisplayMenu::Flush(void) {
while (detailView->IsRunning())
cCondWait::SleepMs(10);
if (initial) {
- if (menuFadeTime) {
+ if ((MenuCategory() != mcPluginSetup) && (MenuCategory() != mcSetupPlugins) && menuFadeTime) {
SetAlpha(0, true);
Start();
}