mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/infoviewer.cpp: fix crash if one of objects missed,

Browse Source 
forward all keys to movieplayer in file play mode, excluding only screenshot, OK, home
This commit is contained in:
[CST] Focus
2016-02-01 16:47:21 +03:00
parent 6a73ba4a65
commit 1ec5af21f7
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/infoviewer.cpp
View File

@@ -437,8 +437,9 @@ void CInfoViewer::paintBody()
if (body == NULL){ if (body == NULL){
body = new CComponentsShapeSquare(ChanInfoX, y_body, BoxEndX-ChanInfoX, h_body); body = new CComponentsShapeSquare(ChanInfoX, y_body, BoxEndX-ChanInfoX, h_body);
}else{ } else {
if(txt_cur_event && txt_next_event){ if (txt_cur_event && txt_cur_start && txt_cur_event_rest &&
txt_next_event && txt_next_start && txt_next_in) {
if (h_body != body->getHeight() || y_body != body->getYPos()){ if (h_body != body->getHeight() || y_body != body->getYPos()){
txt_cur_start->getCTextBoxObject()->clearScreenBuffer(); txt_cur_start->getCTextBoxObject()->clearScreenBuffer();
txt_cur_event->getCTextBoxObject()->clearScreenBuffer(); txt_cur_event->getCTextBoxObject()->clearScreenBuffer();
@@ -964,10 +965,6 @@ void CInfoViewer::loop(bool show_dot)
infoViewerBB->showIcon_16_9(); infoViewerBB->showIcon_16_9();
//infoViewerBB->showIcon_CA_Status(0); //infoViewerBB->showIcon_CA_Status(0);
infoViewerBB->showIcon_Resolution(); infoViewerBB->showIcon_Resolution();
} else if ((g_settings.mode_left_right_key_tv == SNeutrinoSettings::VZAP) && ((msg == CRCInput::RC_right) || (msg == CRCInput::RC_left ))) {
setSwitchMode(IV_MODE_VIRTUAL_ZAP);
res = messages_return::cancel_all;
hideIt = true;
} else if ((msg == NeutrinoMessages::EVT_RECORDMODE) && } else if ((msg == NeutrinoMessages::EVT_RECORDMODE) &&
(CMoviePlayerGui::getInstance().timeshift) && (CRecordManager::getInstance()->GetRecordCount() == 1)) { (CMoviePlayerGui::getInstance().timeshift) && (CRecordManager::getInstance()->GetRecordCount() == 1)) {
res = CNeutrinoApp::getInstance()->handleMsg(msg, data); res = CNeutrinoApp::getInstance()->handleMsg(msg, data);
@@ -1008,7 +1005,7 @@ void CInfoViewer::loop(bool show_dot)
/* this debug message will only hit in movieplayer mode, where console is /* this debug message will only hit in movieplayer mode, where console is
* spammed to death anyway... */ * spammed to death anyway... */
printf("%s:%d msg:%08lx, data: %08lx\n", __func__, __LINE__, (long)msg, (long)data); printf("%s:%d msg->MP: %08lx, data: %08lx\n", __func__, __LINE__, (long)msg, (long)data);
if (msg < CRCInput::RC_Events) /* RC / Keyboard event */ if (msg < CRCInput::RC_Events) /* RC / Keyboard event */
{ {
g_RCInput->postMsg (msg, data); g_RCInput->postMsg (msg, data);
@@ -1017,6 +1014,10 @@ void CInfoViewer::loop(bool show_dot)
else else
res = CNeutrinoApp::getInstance()->handleMsg(msg, data); res = CNeutrinoApp::getInstance()->handleMsg(msg, data);
} else if ((g_settings.mode_left_right_key_tv == SNeutrinoSettings::VZAP) && ((msg == CRCInput::RC_right) || (msg == CRCInput::RC_left ))) {
setSwitchMode(IV_MODE_VIRTUAL_ZAP);
res = messages_return::cancel_all;
hideIt = true;
} }
#if 0 #if 0
else if (CMoviePlayerGui::getInstance().start_timeshift && (msg == NeutrinoMessages::EVT_TIMER)) { else if (CMoviePlayerGui::getInstance().start_timeshift && (msg == NeutrinoMessages::EVT_TIMER)) {