X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Fdvb.cpp;h=516294523be74848efe99c80952296adf628a58a;hp=40d441861d97d5afcffd4f064464961c192fb617;hb=2a0689a69ba995ec3adcf1cd6cc20146a6d4ef58;hpb=dd2f75a38c17459f1a3d46cf529a6b4fe3f7e3f2

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 40d4418..5162945 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -320,27 +320,34 @@ PyObject *eDVBResourceManager::setFrontendSlotInformations(ePyObject list)
 		PyErr_SetString(PyExc_StandardError, "eDVBResourceManager::setFrontendSlotInformations argument should be a python list");
 		return NULL;
 	}
-	if ((unsigned int)PyList_Size(list) != m_frontend.size())
+	unsigned int assigned=0;
+	for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i)
 	{
+		int pos=0;
+		while (pos < PyList_Size(list)) {
+			ePyObject obj = PyList_GET_ITEM(list, pos++);
+			if (!i->m_frontend->setSlotInfo(obj))
+				continue;
+			++assigned;
+			break;
+		}
+	}
+	if (assigned != m_frontend.size()) {
 		char blasel[256];
-		sprintf(blasel, "eDVBResourceManager::setFrontendSlotInformations list size incorrect %d frontends avail, but %d entries in slotlist",
-			m_frontend.size(), PyList_Size(list));
+		sprintf(blasel, "eDVBResourceManager::setFrontendSlotInformations .. assigned %d socket informations, but %d registered frontends!",
+			m_frontend.size(), assigned);
 		PyErr_SetString(PyExc_StandardError, blasel);
 		return NULL;
 	}
-	int pos=0;
-	for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i)
-	{
-		ePyObject obj = PyList_GET_ITEM(list, pos++);
-		if (!i->m_frontend->setSlotInfo(obj))
-			return NULL;
-	}
-	pos=0;
 	for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_simulate_frontend.begin()); i != m_simulate_frontend.end(); ++i)
 	{
-		ePyObject obj = PyList_GET_ITEM(list, pos++);
-		if (!i->m_frontend->setSlotInfo(obj))
-			return NULL;
+		int pos=0;
+		while (pos < PyList_Size(list)) {
+			ePyObject obj = PyList_GET_ITEM(list, pos++);
+			if (!i->m_frontend->setSlotInfo(obj))
+				continue;
+			break;
+		}
 	}
 	Py_RETURN_NONE;
 }