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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/gui/hdd_menu.cpp
	src/gui/hdd_menu.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 73418490bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-10-02 23:21:37 +02:00
parent 6458ea748a 463700033b
commit 0a0c8a13bf
39 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/hdd_menu.cpp
View File

@@ -420,7 +420,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",