X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/43123a02fa8c374fc145eedeb854d4b112fe9262..d43e4676bd757d1de73b8dd669154ffd42192b10:/lib/service/listboxservice.cpp

diff --git a/lib/service/listboxservice.cpp b/lib/service/listboxservice.cpp
index 866963fb..89ef72e4 100644
--- a/lib/service/listboxservice.cpp
+++ b/lib/service/listboxservice.cpp
@@ -191,6 +191,11 @@ void eListboxServiceContent::cursorHome()
 {
 	if (m_current_marked && m_saved_cursor == m_list.end())
 	{
+		if (m_cursor_number >= m_size)
+		{
+			m_cursor_number = m_size-1;
+			--m_cursor;
+		}
 		while (m_cursor_number)
 		{
 			std::iter_swap(m_cursor--, m_cursor);
@@ -353,7 +358,7 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const
 	if (m_current_marked && selected)
 		style.setStyle(painter, eWindowStyle::styleListboxMarked);
 	else if (cursorValid() && isMarked(*m_cursor))
-		style.setStyle(painter, eWindowStyle::styleListboxMarked);
+		style.setStyle(painter, selected ? eWindowStyle::styleListboxMarkedAndSelected : eWindowStyle::styleListboxMarked);
 	else
 		style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
 	painter.clear();
@@ -364,7 +369,7 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const
 		ePtr<iStaticServiceInformation> service_info;
 		m_service_center->info(*m_cursor, service_info);
 
-		if (m_is_playable_ignore.valid() && !service_info->isPlayable(*m_cursor, m_is_playable_ignore))
+		if (m_is_playable_ignore.valid() && service_info && !service_info->isPlayable(*m_cursor, m_is_playable_ignore))
 			painter.setForegroundColor(gRGB(0xbbbbbb));
 
 		for (int e = 0; e < celElements; ++e)