From 263efac2686729be6077377fc4faf05307ea56a9 Mon Sep 17 00:00:00 2001 From: Frank Neumann Date: Sat, 20 May 2017 12:50:05 +0200 Subject: Commit fixblacklist_handling.diff (thx TomJoad@vdr-portal.de) --- HISTORY | 2 ++ HISTORY.DE | 2 ++ blacklist.c | 8 ++------ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/HISTORY b/HISTORY index 5b15429..70061dd 100644 --- a/HISTORY +++ b/HISTORY @@ -28,6 +28,8 @@ new: - Commit 0003-more-cleanups.diff by TomJoad@vdr-portal.de - Commit 0004-Remote-timers-in-menu-myedittimer.diff by TomJoad@vdr-portal.de http://www.vdr-portal.de/board17-developer/board21-vdr-plugins/p1291771-epgsearch-f%C3%BCr-vdr-2-3-x/#post1291771 +- Commit fixblacklist_handling.diff by TomJoad@vdr-portal.de + http://www.vdr-portal.de/board16-video-disk-recorder/board99-distributionen/board107-mld/p1292085-epgsearch-in-verbindung-mit-epgd-epg2vdr-live-absturz-unter-vdr-2-3-4/#post1292085 2013-03-xx; Version 1.0.1 - maintenance release new: diff --git a/HISTORY.DE b/HISTORY.DE index 9e1cfcb..bcdc020 100644 --- a/HISTORY.DE +++ b/HISTORY.DE @@ -28,6 +28,8 @@ neu: - Anwenden 0003-more-cleanups.diff von TomJoad@vdr-portal.de - Anwenden 0004-Remote-timers-in-menu-myedittimer.diff von TomJoad@vdr-portal.de http://www.vdr-portal.de/board17-developer/board21-vdr-plugins/p1291771-epgsearch-f%C3%BCr-vdr-2-3-x/#post1291771 +- Anwenden fixblacklist_handling.diff von TomJoad@vdr-portal.de + http://www.vdr-portal.de/board16-video-disk-recorder/board99-distributionen/board107-mld/p1292085-epgsearch-in-verbindung-mit-epgd-epg2vdr-live-absturz-unter-vdr-2-3-4/#post1292085 2013-03-xx: Version 1.0.1 - Maintenance Release neu: diff --git a/blacklist.c b/blacklist.c index 9d18199..32e6105 100644 --- a/blacklist.c +++ b/blacklist.c @@ -637,16 +637,12 @@ cSearchResults* cBlacklist::Run(cSearchResults* pSearchResults, int MarginStop) { LogFile.Log(3,"start search for blacklist '%s'", search); - LOCK_SCHEDULES_WRITE; - if(!Schedules) { - LogFile.Log(1,"schedules are currently locked! try again later."); - return NULL; - } + LOCK_CHANNELS_READ; + LOCK_SCHEDULES_READ; const cSchedule *Schedule = Schedules->First(); while (Schedule) { - LOCK_CHANNELS_READ; const cChannel* channel = Channels->GetByChannelID(Schedule->ChannelID(),true,true); if (!channel) { -- cgit v1.2.3