mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "- moviebrowser: fix crash; disable non-existing movie directories"

Browse Source 
This reverts commit 615c4f360a, because
this forces user to re-enable these directories manually.
This commit is contained in:
svenhoefer
2016-12-29 00:47:35 +01:00
parent 888bfb6687
commit 95c619ad88
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/moviebrowser/mb.cpp
View File

@@ -2727,37 +2727,24 @@ bool CMovieBrowser::onSortMovieInfoHandleList(std::vector<MI_MOVIE_INFO*>& handl
void CMovieBrowser::updateDir(void) void CMovieBrowser::updateDir(void)
{ {
struct stat info;
m_dir.clear(); m_dir.clear();
#if 0 #if 0
// check if there is a movie dir and if we should use it // check if there is a movie dir and if we should use it
if (g_settings.network_nfs_moviedir[0] != 0) if (g_settings.network_nfs_moviedir[0] != 0)
{ {
if (!(stat(g_settings.network_nfs_moviedir.c_str(), &info) == 0 && S_ISDIR(info.st_mode)))
m_settings.storageDirMovieUsed = false;
std::string name = g_settings.network_nfs_moviedir; std::string name = g_settings.network_nfs_moviedir;
addDir(name,&m_settings.storageDirMovieUsed); addDir(name,&m_settings.storageDirMovieUsed);
} }
#endif #endif
// check if there is a record dir and if we should use it // check if there is a record dir and if we should use it
if (!g_settings.network_nfs_recordingdir.empty()) if (!g_settings.network_nfs_recordingdir.empty())
{ {
if (!(stat(g_settings.network_nfs_recordingdir.c_str(), &info) == 0 && S_ISDIR(info.st_mode)))
m_settings.storageDirRecUsed = false;
addDir(g_settings.network_nfs_recordingdir, &m_settings.storageDirRecUsed); addDir(g_settings.network_nfs_recordingdir, &m_settings.storageDirRecUsed);
cHddStat::getInstance()->statOnce(); cHddStat::getInstance()->statOnce();
} }
for (int i = 0; i < MB_MAX_DIRS; i++) for (int i = 0; i < MB_MAX_DIRS; i++)
{ {
if (!(stat(m_settings.storageDir[i].c_str(), &info) == 0 && S_ISDIR(info.st_mode)))
m_settings.storageDirUsed[i] = false;
if (!m_settings.storageDir[i].empty()) if (!m_settings.storageDir[i].empty())
addDir(m_settings.storageDir[i],&m_settings.storageDirUsed[i]); addDir(m_settings.storageDir[i],&m_settings.storageDirUsed[i]);
} }