X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/cd883d9759844701ef57afa0cb03de7722acc5e5..e2781e0994df40c51d3c0d94baf5cc2eafdf45f2:/lib/service/listboxservice.cpp

diff --git a/lib/service/listboxservice.cpp b/lib/service/listboxservice.cpp
index 2e0dfa98..8bb02611 100644
--- a/lib/service/listboxservice.cpp
+++ b/lib/service/listboxservice.cpp
@@ -8,28 +8,43 @@
 void eListboxServiceContent::addService(const eServiceReference &service, bool beforeCurrent)
 {
 	if (beforeCurrent && m_size)
-	{
 		m_list.insert(m_cursor, service);
-		--m_cursor;
-	}
 	else
 		m_list.push_back(service);
-	++m_size;
+	if (m_size++)
+	{
+		++m_cursor_number;
+		if (m_listbox)
+			m_listbox->entryAdded(m_cursor_number-1);
+	}
+	else
+	{
+		m_cursor = m_list.begin();
+		m_cursor_number=0;
+		m_listbox->entryAdded(0);
+	}
 }
 
 void eListboxServiceContent::removeCurrent()
 {
 	if (m_size && m_listbox)
 	{
-		if (m_cursor_number == m_size-1)
+		if (m_cursor_number == --m_size)
 		{
 			m_list.erase(m_cursor--);
-			--m_cursor_number;
+			if (m_size)
+			{
+				--m_cursor_number;
+				m_listbox->entryRemoved(m_cursor_number+1);
+			}
+			else
+				m_listbox->entryRemoved(m_cursor_number);
 		}
 		else
+		{
 			m_list.erase(m_cursor++);
-		--m_size;
-		m_listbox->entryRemoved(m_cursor_number);
+			m_listbox->entryRemoved(m_cursor_number);
+		}
 	}
 }
 
@@ -195,16 +210,18 @@ int eListboxServiceContent::lookupService(const eServiceReference &ref)
 
 void eListboxServiceContent::setVisualMode(int mode)
 {
+	for (int i=0; i < celElements; ++i)
+	{
+		m_element_position[i] = eRect();
+		m_element_font[i] = 0;
+	}
+
 	m_visual_mode = mode;
-	
+
 	if (m_visual_mode == visModeSimple)
 	{
 		m_element_position[celServiceName] = eRect(ePoint(0, 0), m_itemsize);
 		m_element_font[celServiceName] = new gFont("Regular", 23);
-		m_element_position[celServiceNumber] = eRect();
-		m_element_font[celServiceNumber] = 0;
-		m_element_position[celServiceInfo] = eRect();
-		m_element_font[celServiceInfo] = 0;
 	}
 }
 
@@ -411,7 +428,8 @@ int eListboxServiceContent::size()
 void eListboxServiceContent::setSize(const eSize &size)
 {
 	m_itemsize = size;
-	setVisualMode(m_visual_mode);
+	if (m_visual_mode == visModeSimple)
+		setVisualMode(m_visual_mode);
 }
 
 void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
@@ -482,7 +500,7 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const
 				case celServiceInfo:
 				{
 					ePtr<eServiceEvent> evt;
-					if ( !service_info->getEvent(*m_cursor, evt) )
+					if ( service_info && !service_info->getEvent(*m_cursor, evt) )
 					{
 						std::string name = evt->getEventName();
 						if (!name.length())