diff --git a/src/gui/volumebar.cpp b/src/gui/volumebar.cpp index db88a3cbc..74abf4373 100644 --- a/src/gui/volumebar.cpp +++ b/src/gui/volumebar.cpp @@ -124,7 +124,9 @@ void CVolumeBar::initVolumeBarPosition() if (( neutrino->getMode() != CNeutrinoApp::mode_scart ) && ( neutrino->getMode() != CNeutrinoApp::mode_audio) && ( neutrino->getMode() != CNeutrinoApp::mode_pic)) { if ((neutrino->isMuted()) && (!g_settings.mode_clock)) x_corr = mute_dx + h_spacer; - if (g_settings.mode_clock) + if (CNeutrinoApp::getInstance()->getChannellistIsVisible() == true) + y += std::max(39, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight()) + v_spacer; + else if (g_settings.mode_clock) y = clock_y + clock_height + v_spacer + SHADOW_OFFSET; } x = sw - width - x_corr; diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 72e369df9..6ef1f9349 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -221,6 +221,7 @@ CNeutrinoApp::CNeutrinoApp() current_muted = 0; recordingstatus = 0; g_channel_list_changed = false; + channellist_visible = false; } /*------------------------------------------------------------------------------------- @@ -2365,6 +2366,7 @@ int CNeutrinoApp::showChannelList(const neutrino_msg_t _msg, bool from_menu) { neutrino_msg_t msg = _msg; InfoClock->enableInfoClock(false); + channellist_visible = true; StopSubtitles(); @@ -2448,6 +2450,7 @@ _repeat: goto _show; } + channellist_visible = false; if (!from_menu) InfoClock->enableInfoClock(true); diff --git a/src/neutrino.h b/src/neutrino.h index 9bbe88c7f..67a26d02a 100644 --- a/src/neutrino.h +++ b/src/neutrino.h @@ -103,6 +103,7 @@ private: int radiosort[LIST_MODE_LAST]; CMoviePluginChangeExec *MoviePluginChanger; + bool channellist_visible; void SDT_ReloadChannels(); void setupNetwork( bool force= false ); @@ -211,6 +212,7 @@ public: void stopDaemonsForFlash(); int showChannelList(const neutrino_msg_t msg, bool from_menu = false); CPersonalizeGui & getPersonalizeGui() { return personalize; } + bool getChannellistIsVisible() { return channellist_visible; } }; #endif