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

Merge remote-tracking branch 'check/next-cc'

Browse Source 
Lightly tested only...
This commit is contained in:
Stefan Seyfried
2013-12-25 22:51:23 +01:00
parent 164ab9ab42 bc8b81a190
commit cdd065fc2e
90 changed files with 1583 additions and 1578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/driver/record.cpp
View File

@@ -615,12 +615,12 @@ record_error_msg_t CRecordInstance::MakeFileName(CZapitChannel * channel)
if(check_dir(Directory.c_str())) {
/* check if Directory and network_nfs_recordingdir the same */
if(strcmp(g_settings.network_nfs_recordingdir, Directory.c_str())) {
if(g_settings.network_nfs_recordingdir != Directory) {
/* not the same, check network_nfs_recordingdir and return error if not ok */
if(check_dir(g_settings.network_nfs_recordingdir))
if(check_dir(g_settings.network_nfs_recordingdir.c_str()))
return RECORD_INVALID_DIRECTORY;
/* fallback to g_settings.network_nfs_recordingdir */
Directory = std::string(g_settings.network_nfs_recordingdir);
Directory = g_settings.network_nfs_recordingdir;
}else{
return RECORD_INVALID_DIRECTORY;
}