2 files changed, 15 insertions, 4 deletions
diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp
index 21394de5..bfa09b88 100644
--- a/lib/gui/elistbox.cpp
+++ b/lib/gui/elistbox.cpp
@@ -159,9 +159,19 @@ void eListbox::moveSelection(int dir)
 
 void eListbox::moveSelectionTo(int index)
 {
-	m_content->cursorHome();
-	m_content->cursorMove(index);
-	moveSelection(justCheck);
+	if ( m_content )
+	{
+		m_content->cursorHome();
+		m_content->cursorMove(index);
+		moveSelection(justCheck);
+	}
+}
+
+int eListbox::getCurrentIndex()
+{
+	if ( m_content && m_content->cursorValid() )
+		return m_content->cursorGet();
+	return 0;
 }
 
 void eListbox::updateScrollBar()
diff --git a/lib/gui/elistbox.h b/lib/gui/elistbox.h
index 0e185b44..719b54b2 100644
--- a/lib/gui/elistbox.h
+++ b/lib/gui/elistbox.h
@@ -72,7 +72,8 @@ public:
 		moveEnd,
 		justCheck
 	}; */
-	
+
+	int getCurrentIndex();
 	void moveSelection(int how);
 	void moveSelectionTo(int index);