mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 01:41:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/fb-setmode

Browse Source
This commit is contained in:
M. Liebmann
2017-03-05 13:53:34 +01:00
parent 487b69b1d4 bc188c66ba
commit 52cd29a207
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/imageinfo.cpp
View File

@@ -49,7 +49,6 @@
#include <nhttpd/yconfig.h> #include <nhttpd/yconfig.h>
#define VERSION_FILE TARGET_PREFIX "/.version" #define VERSION_FILE TARGET_PREFIX "/.version"
#define Y_VERSION_FILE DATADIR "/neutrino/httpd/Y_Version.txt"
using namespace std; using namespace std;
@@ -310,7 +309,7 @@ void CImageInfo::InitInfoData()
s_api += ", "; s_api += ", ";
#endif #endif
s_api += "yWeb "; s_api += "yWeb ";
s_api += getYApi(); s_api += getYWebVersion();
s_api += ", "; s_api += ", ";
s_api += HTTPD_NAME; s_api += HTTPD_NAME;
s_api += + " "; s_api += + " ";
@@ -462,12 +461,9 @@ void CImageInfo::hide()
} }
} }
string CImageInfo::getYApi() string CImageInfo::getYWebVersion()
{ {
string ret; CConfigFile yV('=', false);
config.loadConfig(Y_VERSION_FILE); yV.loadConfig(PRIVATE_HTTPDDIR "/Y_Version.txt");
ret = config.getString("version", "n/a"); return yV.getString("version", "n/a");
config.loadConfig(VERSION_FILE);
return ret;
} }

2
src/gui/imageinfo.h
View File

@@ -63,7 +63,7 @@ class CImageInfo : public CMenuTarget
std::string getLicenseText(); std::string getLicenseText();
void ShowWindow(); void ShowWindow();
void ScrollLic(bool scrollDown); void ScrollLic(bool scrollDown);
std::string getYApi(); std::string getYWebVersion();
CComponentsWindowMax *cc_win; CComponentsWindowMax *cc_win;
CComponentsForm *cc_info; CComponentsForm *cc_info;

2
src/zapit/src/zapit.cpp
View File

@@ -516,7 +516,7 @@ bool CZapit::ZapIt(const t_channel_id channel_id, bool forupdate, bool startplay
if (IS_WEBTV(newchannel->getChannelID()) && !newchannel->getUrl().empty()) { if (IS_WEBTV(newchannel->getChannelID()) && !newchannel->getUrl().empty()) {
dvbsub_stop(); 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()); INFO("[zapit] stop rezap to channel %s id %" PRIx64 ")", newchannel->getName().c_str(), newchannel->getChannelID());
return true; return true;
} }