From 544f7cc012b6a2ce32780ec2f0efbdeb35aefbcb Mon Sep 17 00:00:00 2001 From: "J. Krieg" Date: Thu, 22 Nov 2018 00:00:28 +0100 Subject: [PATCH] webradio: switch default webradio paths from CONFIGDIR to WEBRADIODIR_VAR (specified by configure) Signed-off-by: Thilo Graf Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/0b93981a09cb6f6279a8049a4ddd028695735df9 Author: J. Krieg Date: 2018-11-22 (Thu, 22 Nov 2018) --- src/gui/webtv_setup.h | 2 +- src/neutrino.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/webtv_setup.h b/src/gui/webtv_setup.h index ceb53697a..38af493e4 100644 --- a/src/gui/webtv_setup.h +++ b/src/gui/webtv_setup.h @@ -29,7 +29,7 @@ #include #define WEBTV_XML CONFIGDIR "/webtv_usr.xml" -#define WEBRADIO_XML CONFIGDIR "/webradio_usr.xml" +#define WEBRADIO_XML WEBRADIODIR_VAR "/webradio_usr.xml" class CWebTVSetup : public CMenuTarget, CChangeObserver { diff --git a/src/neutrino.cpp b/src/neutrino.cpp index d1cd83f34..44f87c935 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -684,7 +684,7 @@ int CNeutrinoApp::loadSetup(const char * fname) 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.last_webradio_dir = configfile.getString( "last_webradio_dir", CONFIGDIR); + g_settings.last_webradio_dir = configfile.getString( "last_webradio_dir", WEBRADIODIR_VAR); g_settings.last_webtv_dir = configfile.getString( "last_webtv_dir", CONFIGDIR); g_settings.temp_timeshift = configfile.getInt32( "temp_timeshift", 1 ); //NI