X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/daf0e9d82075e4f2bf9dc73267acc282c5d4bd1d..acd4a0e33549fcc02655dc50269dda173196c5a3:/lib/dvb/pmt.cpp

diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index e7094200..a6bde907 100644
--- a/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@ -178,8 +178,8 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 	if ( m_service && !m_service->cacheEmpty() )
 	{
 		cached_vpid = m_service->getCacheEntry(eDVBService::cVPID);
-		cached_apid_mpeg = m_service->getCacheEntry(eDVBService::cAC3PID);
-		cached_apid_ac3 = m_service->getCacheEntry(eDVBService::cAPID);
+		cached_apid_mpeg = m_service->getCacheEntry(eDVBService::cAPID);
+		cached_apid_ac3 = m_service->getCacheEntry(eDVBService::cAC3PID);
 		cached_tpid = m_service->getCacheEntry(eDVBService::cTPID);
 	}
 
@@ -496,8 +496,9 @@ int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux,
 	} else
 	{
 		eDVBMetaParser parser;
-		
-		if (parser.parseFile(ref.path))
+
+		int ret=parser.parseFile(ref.path);
+		if (ret || !parser.m_ref.getServiceID().get() /* incorrect sid in meta file or recordings.epl*/ )
 		{
 			eWarning("no .meta file found, trying to find PMT pid");
 			eDVBTSTools tstools;