mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1ddcc0c7ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-11-02 09:50:10 +01:00
parent abfb65680e c21cc27381
commit 6dfe9dc9ba
50 changed files with 5794 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/widget/menue.cpp
View File

@@ -905,9 +905,11 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
pos -= dir * items.size();
wrap = true;
}
if (pos >= (int)items.size())
if (!items.empty() && pos >= (int)items.size())
pos = (int)items.size() - 1;
do {
if(items.empty())
break;
CMenuItem* item = items[pos];
if (item->isSelectable()) {
if (pos < page_start[current_page + 1] && pos >= page_start[current_page]) {
@@ -1406,7 +1408,7 @@ void CMenuWidget::saveScreen()
delete[] background;
background = new fb_pixel_t [full_width * full_height];
background = new fb_pixel_t [full_width * (full_height+fbutton_height)];
if(background)
frameBuffer->SaveScreen(x /*-ConnectLineBox_Width*/, y, full_width, full_height + fbutton_height, background);
}