From d05b4c8ca78e6d6b0117a3acc35e6ab0b3755204 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Wed, 24 Sep 2014 19:49:35 +0400
Subject: [PATCH] fixes for system/ytcache.cpp cherry-picks

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/8fa560509c0d91889bdf4ddc3279556e1c1ceba9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-24 (Wed, 24 Sep 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
---
 src/neutrino.cpp        | 2 ++
 src/system/ytcache.cpp  | 4 ++++
 src/system/ytparser.cpp | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 0c7293e8c..6ae4c69fb 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -546,6 +546,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
 	g_settings.network_nfs_moviedir = configfile.getString( "network_nfs_moviedir", "/media/sda1/movies" );
 	g_settings.network_nfs_recordingdir = configfile.getString( "network_nfs_recordingdir", "/media/sda1/movies" );
 	g_settings.timeshiftdir = configfile.getString( "timeshiftdir", "" );
+	g_settings.downloadcache_dir = configfile.getString( "downloadcache_dir", g_settings.network_nfs_recordingdir.c_str());
 
 	g_settings.temp_timeshift = configfile.getInt32( "temp_timeshift", 0 );
 	g_settings.auto_timeshift = configfile.getInt32( "auto_timeshift", 0 );
@@ -1058,6 +1059,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
 	configfile.setString( "network_nfs_moviedir", g_settings.network_nfs_moviedir);
 	configfile.setString( "network_nfs_recordingdir", g_settings.network_nfs_recordingdir);
 	configfile.setString( "timeshiftdir", g_settings.timeshiftdir);
+	configfile.setString( "downloadcache_dir", g_settings.downloadcache_dir);
 	configfile.setBool  ("filesystem_is_utf8"                 , g_settings.filesystem_is_utf8             );
 
 	//recording (server + vcr)
diff --git a/src/system/ytcache.cpp b/src/system/ytcache.cpp
index 86fc2b101..d0273f5ec 100644
--- a/src/system/ytcache.cpp
+++ b/src/system/ytcache.cpp
@@ -20,6 +20,10 @@
 	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "ytcache.h"
 #include <OpenThreads/ScopedLock>
 
diff --git a/src/system/ytparser.cpp b/src/system/ytparser.cpp
index 19a516b39..6a244043c 100644
--- a/src/system/ytparser.cpp
+++ b/src/system/ytparser.cpp
@@ -17,6 +17,10 @@
         Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/stat.h>