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

convert most char[...] configuration values to std::string

Browse Source 
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: cbc9299df8
Author: martii <m4rtii@gmx.de>
Date: 2013-06-11 (Tue, 11 Jun 2013)
This commit is contained in:
martii
2013-06-11 13:32:19 +02:00
committed by Jacek Jendrzej
parent bf90c6221f
commit ce44d1641a
40 changed files with 483 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/driver/record.cpp
View File

@@ -614,12 +614,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;
}