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

neutrino.cpp: call CEpgScan::handleMsg() in standart way,

Browse Source 
fixes memleak for events with data
This commit is contained in:
[CST] Focus
2013-10-14 12:46:34 +04:00
parent 3863008e3a
commit a109474d61
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/neutrino.cpp
View File

@@ -2327,7 +2327,6 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
/* update scan settings for manual scan to current channel */ /* update scan settings for manual scan to current channel */
CScanSetup::getInstance()->updateManualSettings(); CScanSetup::getInstance()->updateManualSettings();
CEpgScan::getInstance()->handleMsg(msg, data);
} }
if ((msg == NeutrinoMessages::EVT_TIMER)) { if ((msg == NeutrinoMessages::EVT_TIMER)) {
if(data == scrambled_timer) { if(data == scrambled_timer) {
@@ -2339,19 +2338,17 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
return messages_return::handled; return messages_return::handled;
} }
} }
if ((msg == NeutrinoMessages::EVT_EIT_COMPLETE || msg == NeutrinoMessages::EVT_BACK_ZAP_COMPLETE)) {
CEpgScan::getInstance()->handleMsg(msg, data);
return messages_return::handled;
}
res = res | g_RemoteControl->handleMsg(msg, data); res = res | g_RemoteControl->handleMsg(msg, data);
res = res | g_InfoViewer->handleMsg(msg, data); res = res | g_InfoViewer->handleMsg(msg, data);
res = res | channelList->handleMsg(msg, data); res = res | channelList->handleMsg(msg, data);
res = res | CRecordManager::getInstance()->handleMsg(msg, data); res = res | CRecordManager::getInstance()->handleMsg(msg, data);
res = res | CEpgScan::getInstance()->handleMsg(msg, data);
if( res != messages_return::unhandled ) { if( res != messages_return::unhandled ) {
if( ( msg>= CRCInput::RC_WithData ) && ( msg< CRCInput::RC_WithData+ 0x10000000 ) ) if( ( msg>= CRCInput::RC_WithData ) && ( msg< CRCInput::RC_WithData+ 0x10000000 ) ) {
delete[] (unsigned char*) data; delete[] (unsigned char*) data;
}
return( res & ( 0xFFFFFFFF - messages_return::unhandled ) ); return( res & ( 0xFFFFFFFF - messages_return::unhandled ) );
} }