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

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-09-18 15:55:41 +02:00
parent a23737a626 82a0cdeb68
commit 2dd24f8c21
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/osd_setup.cpp
View File

@@ -1531,6 +1531,7 @@ int COsdSetup::showContextChanlistMenu(CChannelList *parent_channellist)
int res = menu_chanlist->exec(NULL, ""); int res = menu_chanlist->exec(NULL, "");
cselected = menu_chanlist->getSelected(); cselected = menu_chanlist->getSelected();
delete channellistNotifier;
delete menu_chanlist; delete menu_chanlist;
return res; return res;
} }

1
src/neutrino.cpp
View File

@@ -3952,6 +3952,7 @@ void CNeutrinoApp::saveEpg(bool cvfd_mode)
//printf("Msg %x timeout %d EVT_SI_FINISHED %x\n", msg, CRCInput::RC_timeout, NeutrinoMessages::EVT_SI_FINISHED); //printf("Msg %x timeout %d EVT_SI_FINISHED %x\n", msg, CRCInput::RC_timeout, NeutrinoMessages::EVT_SI_FINISHED);
CVFD::getInstance()->Clear(); CVFD::getInstance()->Clear();
CVFD::getInstance()->setMode(cvfd_mode ? CVFD::MODE_SHUTDOWN : CVFD::MODE_STANDBY);// true CVFD::MODE_SHUTDOWN , false CVFD::MODE_STANDBY CVFD::getInstance()->setMode(cvfd_mode ? CVFD::MODE_SHUTDOWN : CVFD::MODE_STANDBY);// true CVFD::MODE_SHUTDOWN , false CVFD::MODE_STANDBY
delete [] (unsigned char*) data;
break; break;
} else if (!cvfd_mode){ } else if (!cvfd_mode){
printf("wait for epg saving, Msg %x \n", (int) msg); printf("wait for epg saving, Msg %x \n", (int) msg);