{
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);
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();
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)