mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 09:21:09 +02:00
fix playlist
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1917e283eb
Author: TangoCash <eric@loxat.de>
Date: 2015-05-14 (Thu, 14 May 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -449,7 +449,12 @@ bool CMoviePlayerGui::prepareFile(CFile *file)
|
||||
currentspid = -1;
|
||||
numsubs = 0;
|
||||
autoshot_done = 0;
|
||||
file_name = file->Name;
|
||||
if (file->Url.empty())
|
||||
file_name = file->Name;
|
||||
else {
|
||||
file_name = file->Url;
|
||||
pretty_name = file->Name;
|
||||
}
|
||||
if (isMovieBrowser) {
|
||||
if (filelist_it != filelist.end()) {
|
||||
unsigned idx = filelist_it - filelist.begin();
|
||||
@@ -545,9 +550,13 @@ bool CMoviePlayerGui::SelectFile()
|
||||
}
|
||||
if (file) {
|
||||
is_file_player = true;
|
||||
ret = prepareFile(file);
|
||||
if (file->getType() == CFile::FILE_PLAYLIST)
|
||||
parsePlaylist(file);
|
||||
if (!filelist.empty()) {
|
||||
filelist_it = filelist.begin();
|
||||
file = &(*filelist_it);
|
||||
}
|
||||
ret = prepareFile(file);
|
||||
}
|
||||
}
|
||||
menu_ret = filebrowser->getMenuRet();
|
||||
|
Reference in New Issue
Block a user