Ticket #10054: patch.txt

File patch.txt, 628 bytes (added by Argus <pthorn-mythd@…>, 8 years ago)

Patch to correct conflicts

Line 
1diff --git a/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp b/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
2index 832d0a8..812596c 100644
3--- a/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
4+++ b/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
5@@ -776,7 +776,7 @@ bool ChannelScanSM::UpdateChannelInfo(bool wait_until_complete)
6         if (tsid_checked[tsid])
7             continue;
8         tsid_checked[tsid] = true;
9-        if (!currentInfo->sdts[tsid].empty())
10+        if (currentInfo->sdts.contains(tsid))
11             continue;
12 
13         if (!wait_until_complete || sd->HasCachedAllSDT(tsid))