diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp index b028e80c6..ef53a2e15 100644 --- a/src/gui/audioplayer.cpp +++ b/src/gui/audioplayer.cpp @@ -1637,7 +1637,7 @@ void CAudioPlayerGui::paintFoot() if (m_screensaver) return; - const struct button_label ScondLineButtons[3] = + const struct button_label SecondLineButtons[3] = { { NEUTRINO_ICON_BUTTON_OKAY , LOCALE_AUDIOPLAYER_PLAY }, { NEUTRINO_ICON_BUTTON_HELP , LOCALE_AUDIOPLAYER_KEYLEVEL }, @@ -1656,7 +1656,7 @@ void CAudioPlayerGui::paintFoot() int bwidth = m_width - (2*c_rad_mid); if (!m_playlist.empty()) - ::paintButtons(m_x + c_rad_mid, top+m_buttonHeight, bwidth, 3, ScondLineButtons, bwidth, m_buttonHeight); + ::paintButtons(m_x + c_rad_mid, top+m_buttonHeight, bwidth, 3, SecondLineButtons, bwidth, m_buttonHeight); if (m_key_level == 0) { diff --git a/src/gui/components/cc_frm_scrollbar.cpp b/src/gui/components/cc_frm_scrollbar.cpp index 529d0102a..2fcfd737c 100644 --- a/src/gui/components/cc_frm_scrollbar.cpp +++ b/src/gui/components/cc_frm_scrollbar.cpp @@ -165,9 +165,6 @@ void CComponentsScrollBar::initSegments() y_seg += h_seg + append_y_offset; int id = sb_segments_obj->getCCItemId(item); - if (sb_mark_id > id){ - dprintf(DEBUG_NORMAL, "[CComponentsScrollBar] %s: sb_mark_id out of range current=%d allowed=%d\n", __func__, sb_mark_id, id); - } //set color for marked id if (sb_mark_id == id){ diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp index 6515f171e..9a013a6af 100644 --- a/src/gui/videosettings.cpp +++ b/src/gui/videosettings.cpp @@ -565,6 +565,7 @@ void CVideoSettings::nextMode(void) int curmode = 0; int i; bool disp_cur = 1; + int res = messages_return::none; for (i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++) { if (VIDEOMENU_VIDEOMODE_OPTIONS[i].key == g_settings.video_Mode) { @@ -576,7 +577,9 @@ void CVideoSettings::nextMode(void) while(1) { CVFD::getInstance()->ShowText(text); - int res = ShowHint(LOCALE_VIDEOMENU_VIDEOMODE, text, 450, 2); + + if (res != messages_return::cancel_info) // avoid unnecessary display of messageboxes, when user is trying to press repeated format button + res = ShowHint(LOCALE_VIDEOMENU_VIDEOMODE, text, 450, 2); if(disp_cur && res != messages_return::handled) break; diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 4ad600565..aa2a1803a 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3463,7 +3463,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data) if (rec_mode == CRecordManager::RECMODE_OFF || rec_mode == CRecordManager::RECMODE_TSHIFT) CRecordManager::getInstance()->Record(live_channel_id); delete[] (unsigned char*) data; - return messages_return::handled | messages_return::cancel_all; + return messages_return::handled; } if(mode == mode_standby){ if((eventinfo->channel_id != live_channel_id) && !(SAME_TRANSPONDER(live_channel_id, eventinfo->channel_id))) @@ -3481,7 +3481,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data) } delete[] (unsigned char*) data; - return messages_return::handled | messages_return::cancel_all; + return messages_return::handled; } else if( msg == NeutrinoMessages::RECORD_STOP) { CTimerd::RecordingStopInfo* recinfo = (CTimerd::RecordingStopInfo*)data;