mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-07 05:38:28 +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
------------------
Commit: b93d809116
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)
This commit is contained in:
vanhofen
2016-10-21 11:30:48 +02:00
parent 1a4da62152 2510d548e0
commit bf28c38024
16 changed files with 581 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/filebrowser.cpp
View File

@@ -1174,7 +1174,11 @@ void CFileBrowser::paintItem(unsigned int pos)
unsigned int currpos = liststart + pos;
if (currpos >= filelist.size())
{
// just paint an empty line
frameBuffer->paintBoxRel(x,ypos, width- 15, fheight, COL_MENUCONTENT_PLUS_0);
return;
}
actual_file = &filelist[currpos];