Permalink
Browse files

Remove cardinput.sourceid reference from VideoSourceEditor::cardTypes…

…Include which was altered in master
  • Loading branch information...
1 parent 9df4064 commit cb38d8ba29f589f9ccef15dabd8e5a407fff17a6 @pinkylinc committed Jun 12, 2012
Showing with 6 additions and 4 deletions.
  1. +6 −4 mythtv/libs/libmythtv/videosource.cpp
@@ -847,10 +847,12 @@ bool VideoSourceEditor::cardTypesInclude(const int &sourceID,
{
MSqlQuery query(MSqlQuery::InitCon());
query.prepare("SELECT count(cardtype)"
- " FROM cardinput,capturecard "
- " WHERE capturecard.cardid = cardinput.cardid "
- " AND cardinput.sourceid= :SOURCEID "
- " AND capturecard.cardtype= :CARDTYPE ;");
+ " FROM cardinput,capturecard, videosourcemap as map"
+ " WHERE capturecard.cardid = cardinput.cardid AND "
+ " cardinput.cardinputid = map.cardinputid AND "
+ " map.sourceid = :SOURCEID AND "
+ " map.type in ('main') AND "
+ " capturecard.cardtype = 'DVB' ");
query.bindValue(":SOURCEID", sourceID);
query.bindValue(":CARDTYPE", thecardtype);

0 comments on commit cb38d8b

Please sign in to comment.