From 669c1fc9bf7d70d1a011dcd92b57015ffa22eb37 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 6 Dec 2013 13:30:52 +0100 Subject: [PATCH] yWeb: use same order in search for channellogos as neutrino Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/a8f7668a9c3de1d393fbca9c54dafeefa385f3b5 Author: vanhofen Date: 2013-12-06 (Fri, 06 Dec 2013) Origin message was: ------------------ - yWeb: use same order in search for channellogos as neutrino ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp b/src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp index e81b881c4..9fd3bf171 100644 --- a/src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp +++ b/src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp @@ -483,18 +483,18 @@ std::string CNeutrinoAPI::getLogoFile(std::string _logoURL, t_channel_id channel std::string channelName = GetServiceName(channelId); // replace(channelName, " ", "_"); _logoURL+="/"; - if(access((_logoURL + channelIdAsString + ".jpg").c_str(), 4) == 0) - return _logoURL + channelIdAsString + ".jpg"; - else if (access((_logoURL + channelIdAsString + ".png").c_str(), 4) == 0) - return _logoURL + channelIdAsString + ".png"; - else if (access((_logoURL + channelIdAsString + ".gif").c_str(), 4) == 0) - return _logoURL + channelIdAsString + ".gif"; + if (access((_logoURL + channelName + ".png").c_str(), 4) == 0) + return _logoURL + channelName + ".png"; else if (access((_logoURL + channelName + ".jpg").c_str(), 4) == 0) return _logoURL + channelName + ".jpg"; - else if (access((_logoURL + channelName + ".png").c_str(), 4) == 0) - return _logoURL + channelName + ".png"; else if (access((_logoURL + channelName + ".gif").c_str(), 4) == 0) return _logoURL + channelName + ".gif"; + else if(access((_logoURL + channelIdAsString + ".png").c_str(), 4) == 0) + return _logoURL + channelIdAsString + ".png"; + else if (access((_logoURL + channelIdAsString + ".jpg").c_str(), 4) == 0) + return _logoURL + channelIdAsString + ".jpg"; + else if (access((_logoURL + channelIdAsString + ".gif").c_str(), 4) == 0) + return _logoURL + channelIdAsString + ".gif"; else return ""; }