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

overload access(2)

Browse Source 
Conflicts:
	src/driver/pictureviewer/pictureviewer.cpp
	src/gui/components/cc_item_picture.cpp
	src/gui/movieplayer.cpp
	src/gui/osdlang_setup.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.h
	src/system/setting_helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 81ca577fb8
Author: martii <m4rtii@gmx.de>
Date: 2013-06-30 (Sun, 30 Jun 2013)



------------------
This commit was generated by Migit
This commit is contained in:
martii
2013-06-30 17:00:34 +02:00
committed by [CST] Focus
parent 68680d81b1
commit 070b342de4
14 changed files with 42 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nhttpd/yhttpd.cpp
View File

@@ -13,6 +13,7 @@
#include <stdio.h>
#include <system/set_threadname.h>
#include <system/helpers.h>
// yhttpd
#include "yconfig.h"
#include <ylogging.h>
@@ -549,16 +550,16 @@ void Cyhttpd::ReadConfig(void) {
// Check location of logos
if (Config->getString("Tuxbox.LogosURL", "") == "") {
if (access(std::string(ConfigList["WebsiteMain.override_directory"] + "/logos").c_str(), R_OK) == 0) {
if (access(ConfigList["WebsiteMain.override_directory"] + "/logos", R_OK) == 0) {
Config->setString("Tuxbox.LogosURL", ConfigList["WebsiteMain.override_directory"] + "/logos");
have_config = false; //save config
}
else if (access(std::string(ConfigList["WebsiteMain.directory"] + "/logos").c_str(), R_OK) == 0) {
else if (access(ConfigList["WebsiteMain.directory"] + "/logos", R_OK) == 0){
Config->setString("Tuxbox.LogosURL", ConfigList["WebsiteMain.directory"] + "/logos");
have_config = false; //save config
}
#ifdef Y_CONFIG_USE_HOSTEDWEB
else if (access(std::string(ConfigList["WebsiteMain.hosted_directory"] + "/logos").c_str(), R_OK) == 0) {
else if (access(ConfigList["WebsiteMain.hosted_directory"] + "/logos", R_OK) == 0){
Config->setString("Tuxbox.LogosURL", ConfigList["WebsiteMain.hosted_directory"] + "/logos");
have_config = false; //save config
}