From 629f91e22901a0962008aea6e1fa9a68a1cadd23 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Fri, 3 Mar 2017 15:48:31 +0100 Subject: [PATCH 1/3] - imageinfo: change handling of yWeb version; use own CConfigFile --- src/gui/imageinfo.cpp | 13 +++++-------- src/gui/imageinfo.h | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/gui/imageinfo.cpp b/src/gui/imageinfo.cpp index 15dd92544..aaa942d65 100644 --- a/src/gui/imageinfo.cpp +++ b/src/gui/imageinfo.cpp @@ -310,7 +310,7 @@ void CImageInfo::InitInfoData() s_api += ", "; #endif s_api += "yWeb "; - s_api += getYApi(); + s_api += getYWebVersion(); s_api += ", "; s_api += HTTPD_NAME; s_api += + " "; @@ -462,12 +462,9 @@ void CImageInfo::hide() } } -string CImageInfo::getYApi() +string CImageInfo::getYWebVersion() { - string ret; - config.loadConfig(Y_VERSION_FILE); - ret = config.getString("version", "n/a"); - config.loadConfig(VERSION_FILE); - return ret; + CConfigFile yV('=', false); + yV.loadConfig(PRIVATE_HTTPDDIR "/Y_Version.txt"); + return yV.getString("version", "n/a"); } - diff --git a/src/gui/imageinfo.h b/src/gui/imageinfo.h index 9d6e399f8..0449b7591 100644 --- a/src/gui/imageinfo.h +++ b/src/gui/imageinfo.h @@ -63,7 +63,7 @@ class CImageInfo : public CMenuTarget std::string getLicenseText(); void ShowWindow(); void ScrollLic(bool scrollDown); - std::string getYApi(); + std::string getYWebVersion(); CComponentsWindowMax *cc_win; CComponentsForm *cc_info; From b283128d0ff639fd05ab8ec8834e466f266a4639 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Fri, 3 Mar 2017 15:50:47 +0100 Subject: [PATCH 2/3] - imageinfo: remove obsolete define --- src/gui/imageinfo.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/gui/imageinfo.cpp b/src/gui/imageinfo.cpp index aaa942d65..8dd342ed8 100644 --- a/src/gui/imageinfo.cpp +++ b/src/gui/imageinfo.cpp @@ -49,7 +49,6 @@ #include #define VERSION_FILE TARGET_PREFIX "/.version" -#define Y_VERSION_FILE DATADIR "/neutrino/httpd/Y_Version.txt" using namespace std; From bc188c66bacdf27cff569cd7c3489ef650e6607d Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sun, 5 Mar 2017 13:48:40 +0100 Subject: [PATCH 3/3] src/zapit/src/zapit.cpp fix segfault without services.xml --- src/zapit/src/zapit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index e8682ba1b..da0b6eaa8 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -515,7 +515,7 @@ bool CZapit::ZapIt(const t_channel_id channel_id, bool forupdate, bool startplay if (IS_WEBTV(newchannel->getChannelID()) && !newchannel->getUrl().empty()) { dvbsub_stop(); - if (current_channel->getChannelID() == newchannel->getChannelID() && !newchannel->getScriptName().empty()){ + if (current_channel && current_channel->getChannelID() == newchannel->getChannelID() && !newchannel->getScriptName().empty()){ INFO("[zapit] stop rezap to channel %s id %" PRIx64 ")", newchannel->getName().c_str(), newchannel->getChannelID()); return true; }