mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 09:51:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix playlist

Browse Source 
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:
TangoCash
2015-05-14 23:29:22 +02:00
committed by vanhofen
parent 16145b976a
commit 16ec5dd92c
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/movieplayer.cpp
View File

@@ -449,7 +449,12 @@ bool CMoviePlayerGui::prepareFile(CFile *file)
currentspid = -1; currentspid = -1;
numsubs = 0; numsubs = 0;
autoshot_done = 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 (isMovieBrowser) {
if (filelist_it != filelist.end()) { if (filelist_it != filelist.end()) {
unsigned idx = filelist_it - filelist.begin(); unsigned idx = filelist_it - filelist.begin();
@@ -545,9 +550,13 @@ bool CMoviePlayerGui::SelectFile()
} }
if (file) { if (file) {
is_file_player = true; is_file_player = true;
ret = prepareFile(file);
if (file->getType() == CFile::FILE_PLAYLIST) if (file->getType() == CFile::FILE_PLAYLIST)
parsePlaylist(file); parsePlaylist(file);
if (!filelist.empty()) {
filelist_it = filelist.begin();
file = &(*filelist_it);
}
ret = prepareFile(file);
} }
} }
menu_ret = filebrowser->getMenuRet(); menu_ret = filebrowser->getMenuRet();