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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e8dd73320
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-10-02 23:19:49 +02:00
parent 6e4cd9f08c 586a1b5a49
commit 463700033b
38 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nhttpd/tuxboxapi/neutrinoyparser.cpp
View File

@@ -597,7 +597,7 @@ std::string CNeutrinoYParser::func_get_logo_name(CyhookHandler *hh, std::string
std::string fileType[] = { ".png", ".jpg" , ".gif" };
std::string channelIdShort = channelId.substr(channelId.length() - 12);
channelIdShort = channelIdShort.erase(0, min(channelIdShort.find_first_not_of('0'), channelIdShort.size()-1));
channelIdShort = channelIdShort.erase(0, std::min(channelIdShort.find_first_not_of('0'), channelIdShort.size()-1));
std::string channelName = "";
t_channel_id chId = 0;