X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/219139e42996b26a001728406825d87fbdba6e0d..5c30e18bc4e27a6814545d6dade5fc48884a7c0e:/lib/gui/elistbox.cpp?ds=sidebyside

diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp
index cfb3d5b4..65b24503 100644
--- a/lib/gui/elistbox.cpp
+++ b/lib/gui/elistbox.cpp
@@ -78,6 +78,8 @@ bool eListbox::atEnd()
 
 void eListbox::moveToEnd()
 {
+	if (!m_content)
+		return;
 	/* move to last existing one ("end" is already invalid) */
 	m_content->cursorEnd(); m_content->cursorMove(-1);
 	/* current selection invisible? */
@@ -363,7 +365,8 @@ void eListbox::recalcSize()
 {
 	m_content_changed=true;
 	m_prev_scrollbar_page=-1;
-	m_content->setSize(eSize(size().width(), m_itemheight));
+	if (m_content)
+		m_content->setSize(eSize(size().width(), m_itemheight));
 	m_items_per_page = size().height() / m_itemheight;
 
 	if (m_items_per_page < 0) /* TODO: whyever - our size could be invalid, or itemheigh could be wrongly specified. */
@@ -413,7 +416,7 @@ void eListbox::entryAdded(int index)
 
 void eListbox::entryRemoved(int index)
 {
-	if (index == m_selected)
+	 if (index == m_selected && m_content)
 		m_selected = m_content->cursorGet();
 
 	moveSelection(justCheck);