mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-30 08:51:04 +02:00
fix copy, supplement to last commit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 733be3c8b0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2018-03-25 (Sun, 25 Mar 2018)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -1658,14 +1658,14 @@ void CInfoViewer::sendNoEpg(const t_channel_id for_channel_id)
|
||||
}
|
||||
}
|
||||
|
||||
void copy_info(CSectionsdClient::CurrentNextInfo _info, CSectionsdClient::CurrentNextInfo _oldinfo)
|
||||
void copy_info(CSectionsdClient::CurrentNextInfo *_info, CSectionsdClient::CurrentNextInfo *_oldinfo)
|
||||
{
|
||||
_oldinfo.current_uniqueKey = _info.current_uniqueKey;
|
||||
_oldinfo.current_name = _info.current_name;
|
||||
_oldinfo.current_fsk = _info.current_fsk;
|
||||
_oldinfo.next_uniqueKey = _info.next_uniqueKey;
|
||||
_oldinfo.next_name = _info.next_name;
|
||||
_oldinfo.flags = _info.flags;
|
||||
_oldinfo->current_uniqueKey = _info->current_uniqueKey;
|
||||
_oldinfo->current_name = _info->current_name;
|
||||
_oldinfo->current_fsk = _info->current_fsk;
|
||||
_oldinfo->next_uniqueKey = _info->next_uniqueKey;
|
||||
_oldinfo->next_name = _info->next_name;
|
||||
_oldinfo->flags = _info->flags;
|
||||
}
|
||||
|
||||
void CInfoViewer::getEPG(const t_channel_id for_channel_id, CSectionsdClient::CurrentNextInfo &info)
|
||||
@@ -1681,7 +1681,7 @@ void CInfoViewer::getEPG(const t_channel_id for_channel_id, CSectionsdClient::Cu
|
||||
|
||||
/* of there is no EPG, send an event so that parental lock can work */
|
||||
if (info.current_uniqueKey == 0 && info.next_uniqueKey == 0) {
|
||||
copy_info(info,oldinfo);
|
||||
copy_info(&info,&oldinfo);
|
||||
sendNoEpg(for_channel_id);
|
||||
return;
|
||||
}
|
||||
@@ -1701,7 +1701,7 @@ void CInfoViewer::getEPG(const t_channel_id for_channel_id, CSectionsdClient::Cu
|
||||
else
|
||||
msg = NeutrinoMessages::EVT_NOEPG_YET;
|
||||
g_RCInput->postMsg(msg, (const neutrino_msg_data_t)p, false); // data is pointer to allocated memory
|
||||
copy_info(info,oldinfo);
|
||||
copy_info(&info,&oldinfo);
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user