Merge remote-tracking branch 'check/next-cc'

broken, needs buildfixing


Origin commit data
------------------
Branch: ni/coolstream
Commit: add688bbb8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-23 (Sun, 23 Feb 2014)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2014-02-23 15:17:48 +01:00
23 changed files with 644 additions and 96 deletions

View File

@@ -981,7 +981,13 @@ bool CFileBrowser::exec(const char * const dirname)
std::string filename = filelist[selected].Name;
if ( filename.length() > 1 )
{
if((!Multi_Select) && S_ISDIR(filelist[selected].Mode) && !Dir_Mode)
bool return_dir = false;
if (Hide_records && S_ISDIR(filelist[selected].Mode)) {
std::string bdmv = filename + "/BDMV/index.bdmv";
if (access(bdmv.c_str(), F_OK) == 0)
return_dir = true;
}
if(!return_dir && (!Multi_Select) && S_ISDIR(filelist[selected].Mode) && !Dir_Mode)
{
#ifdef ENABLE_INTERNETRADIO
if (m_Mode == ModeSC)