mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tuxbox/master'

Browse Source
This commit is contained in:
Stefan Seyfried
2017-02-11 11:18:45 +01:00
parent 0f4e6298c8 582051b9a1
commit 8b47699447
32 changed files with 217 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/neutrino.cpp
View File

@@ -972,7 +972,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.infoClockSeconds = configfile.getInt32("infoClockSeconds", 1);
g_settings.livestreamResolution = configfile.getInt32("livestreamResolution", 1920);
g_settings.livestreamScriptPath = configfile.getString("livestreamScriptPath", PLUGINDIR_VAR "/webtv");
g_settings.livestreamScriptPath = configfile.getString("livestreamScriptPath", WEBTVDIR_VAR);
g_settings.version_pseudo = configfile.getString("version_pseudo", "19700101000000");