Merge branch 'master' into pu/mp

Origin commit data
------------------
Commit: 7ad4a0e6cc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-02 (Mon, 02 Oct 2017)
This commit is contained in:
Jacek Jendrzej
2017-10-02 13:56:25 +02:00
38 changed files with 68 additions and 68 deletions

View File

@@ -418,7 +418,7 @@ void CHDDMenuHandler::setRecordPath(std::string &dev)
return;
}
/* don't annoy if the recordingdir is a symlink pointing to the 'right' location */
string readl = readlink(g_settings.network_nfs_recordingdir.c_str());
std::string readl = readlink(g_settings.network_nfs_recordingdir.c_str());
readl = trim(readl);
if (newpath.compare(readl) == 0) {
printf("CHDDMenuHandler::%s: recordingdir is a symlink to %s\n",