mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-27 23:42:58 +02:00
Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
Conflicts: src/neutrino.cpp
This commit is contained in:
@@ -1084,7 +1084,8 @@ printf("[neutrino] CSectionsdClient::EVT_GOT_CN_EPG\n");
|
||||
break;
|
||||
case CTimerdClient::EVT_ANNOUNCE_ZAPTO :
|
||||
*msg = NeutrinoMessages::ANNOUNCE_ZAPTO;
|
||||
*data = 0;
|
||||
*data = (neutrino_msg_data_t)p;
|
||||
dont_delete_p = true;
|
||||
break;
|
||||
case CTimerdClient::EVT_ANNOUNCE_SHUTDOWN :
|
||||
*msg = NeutrinoMessages::ANNOUNCE_SHUTDOWN;
|
||||
|
Reference in New Issue
Block a user