From: ghost <andreas.monzner@multimedia-labs.de>
Date: Sun, 31 May 2009 15:50:58 +0000 (+0200)
Subject: dvb.cpp: another dm500hd/dm800 demux policy fix
X-Git-Tag: 2.6.0~284
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/1c0fed5449b5ab880575587803451fc58fee13eb?ds=sidebyside

dvb.cpp: another dm500hd/dm800 demux policy fix
---

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 3c2c22af..d30be29c 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -438,14 +438,24 @@ RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBA
 				if (!unused)
 					unused = i;
 			}
-			else if (!fe || (i->m_adapter == fe->m_adapter &&
-			    i->m_demux->getSource() == fe->m_frontend->getDVBID()))
+			else
 			{
-				demux = new eDVBAllocatedDemux(i);
-				return 0;
+				if (fe)
+				{
+					if (i->m_adapter == fe->m_adapter && 
+					    i->m_demux->getSource() == fe->m_frontend->getDVBID())
+					{
+						demux = new eDVBAllocatedDemux(i);
+						return 0;
+					}
+				}
+				else if (i->m_demux->getSource() == -1) // PVR
+				{
+					demux = new eDVBAllocatedDemux(i);
+					return 0;
+				}
 			}
 		}
-	
 	}
 	else if (m_demux.size() < 5) // ATI
 	{