frodovdr/vdr-plugin-tvguide
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-tvguide.git synced 2023-10-05 15:01:48 +02:00
Code Issues Releases Wiki Activity

Fixed a "invalid lock sequence report" in "cRecManager::PerformSearchTimerSearch"

Browse Source
This commit is contained in:
kamel5 2019-03-28 13:10:31 +01:00
parent 56014ea736
commit 060089548a
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
recmanager.c
View File

@ -409,12 +409,14 @@ const cEvent **cRecManager::PerformSearchTimerSearch(std::string epgSearchString
numResults = results.size(); numResults = results.size();
if (numResults > 0) { if (numResults > 0) {
searchResults = new const cEvent *[numResults]; searchResults = new const cEvent *[numResults];
const cSchedules *schedules;
#if VDRVERSNUM >= 20301 #if VDRVERSNUM >= 20301
{
LOCK_SCHEDULES_READ; LOCK_SCHEDULES_READ;
const cSchedules* schedules = Schedules; schedules = Schedules;
}
#else #else
cSchedulesLock schedulesLock; cSchedulesLock schedulesLock;
const cSchedules *schedules;
schedules = cSchedules::Schedules(schedulesLock); schedules = cSchedules::Schedules(schedulesLock);
#endif #endif
const cEvent *event = NULL; const cEvent *event = NULL;
@ -426,11 +428,14 @@ const cEvent **cRecManager::PerformSearchTimerSearch(std::string epgSearchString
int eventID = atoi(flds[1].c_str()); int eventID = atoi(flds[1].c_str());
std::string channelID = flds[7]; std::string channelID = flds[7];
tChannelID chanID = tChannelID::FromString(channelID.c_str()); tChannelID chanID = tChannelID::FromString(channelID.c_str());
const cChannel *channel;
#if VDRVERSNUM >= 20301 #if VDRVERSNUM >= 20301
{
LOCK_CHANNELS_READ; LOCK_CHANNELS_READ;
const cChannel *channel = Channels->GetByChannelID(chanID); channel = Channels->GetByChannelID(chanID);
}
#else #else
cChannel *channel = Channels.GetByChannelID(chanID); channel = Channels.GetByChannelID(chanID);
#endif #endif
if (channel) { if (channel) {
const cSchedule *Schedule = NULL; const cSchedule *Schedule = NULL;