X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fservice%2Flistboxservice.cpp;h=f51450745716d125db424bf9b967c4ec40fed9e2;hp=32b9007f71c41675f4f22c68e214e58ffb518afb;hb=265fb595e8767536096985bcfca7d0c36e61b5a0;hpb=5e9af99815e94c739e4b13b04f4af74e77074d96

diff --git a/lib/service/listboxservice.cpp b/lib/service/listboxservice.cpp
index 32b9007..f514507 100644
--- a/lib/service/listboxservice.cpp
+++ b/lib/service/listboxservice.cpp
@@ -51,12 +51,10 @@ void eListboxServiceContent::setRoot(const eServiceReference &root, bool justSet
 		return;
 	assert(m_service_center);
 	
-	ePtr<iListableService> lst;
-	if (m_service_center->list(m_root, lst))
+	if (m_service_center->list(m_root, m_lst))
 		eDebug("no list available!");
-	else
-		if (lst->getContent(m_list))
-			eDebug("getContent failed");
+	else if (m_lst->getContent(m_list))
+		eDebug("getContent failed");
 
 	FillFinished();
 }
@@ -227,10 +225,11 @@ void eListboxServiceContent::setPixmap(int type, ePtr<gPixmap> &pic)
 
 void eListboxServiceContent::sort()
 {
-	ePtr<iListableService> lst;
-	if (!m_service_center->list(m_root, lst))
+	if (!m_lst)
+		m_service_center->list(m_root, m_lst);
+	if (m_lst)
 	{
-		m_list.sort(iListableServiceCompare(lst));
+		m_list.sort(iListableServiceCompare(m_lst));
 			/* FIXME: is this really required or can we somehow keep the current entry? */
 		cursorHome();
 		if (m_listbox)
@@ -304,13 +303,12 @@ int eListboxServiceContent::setCurrentMarked(bool state)
 		m_listbox->entryChanged(m_cursor_number);
 		if (!state)
 		{
-			ePtr<iListableService> lst;
-			if (m_service_center->list(m_root, lst))
-				eDebug("no list available!");
-			else
+			if (!m_lst)
+				m_service_center->list(m_root, m_lst);
+			if (m_lst)
 			{
 				ePtr<iMutableServiceList> list;
-				if (lst->startEdit(list))
+				if (m_lst->startEdit(list))
 					eDebug("no editable list");
 				else
 				{
@@ -329,6 +327,8 @@ int eListboxServiceContent::setCurrentMarked(bool state)
 					}
 				}
 			}
+			else
+				eDebug("no list available!");
 		}
 	}