git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lower prio for subservice quickzap actions (needed for working seek actions)
[enigma2.git]
/
lib
/
service
/
listboxservice.cpp
diff --git
a/lib/service/listboxservice.cpp
b/lib/service/listboxservice.cpp
index d87e3155e0369709284a54402348ebf8185507e7..8bb026116284bb27c973b03157c2862d0309bb61 100644
(file)
--- a/
lib/service/listboxservice.cpp
+++ b/
lib/service/listboxservice.cpp
@@
-11,25
+11,40
@@
void eListboxServiceContent::addService(const eServiceReference &service, bool b
m_list.insert(m_cursor, service);
else
m_list.push_back(service);
m_list.insert(m_cursor, service);
else
m_list.push_back(service);
- ++m_size;
- ++m_cursor_number;
- if (m_listbox)
- m_listbox->entryAdded(m_cursor_number-1);
+ 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)
{
}
void eListboxServiceContent::removeCurrent()
{
if (m_size && m_listbox)
{
- --m_size;
- if (m_cursor_number == m_size-1)
+ if (m_cursor_number == --m_size)
{
m_list.erase(m_cursor--);
{
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
}
else
+ {
m_list.erase(m_cursor++);
m_list.erase(m_cursor++);
- m_listbox->entryRemoved(m_cursor_number+1);
+ m_listbox->entryRemoved(m_cursor_number);
+ }
}
}
}
}