Merge branch 'master' into multituner

This commit is contained in:
[CST] Focus
2012-03-22 19:14:27 +04:00
3 changed files with 8 additions and 7 deletions

View File

@@ -232,7 +232,7 @@ bool CRecordInstance::Stop(bool remove_event)
CCamManager::getInstance()->Stop(channel_id, CCamManager::RECORD);
if((autoshift && g_settings.auto_delete) /* || autoshift_delete*/) {
snprintf(buf,sizeof(buf), "rm -f %s.ts &", filename);
snprintf(buf,sizeof(buf), "nice -n 20 rm -f %s.ts &", filename);
system(buf);
snprintf(buf,sizeof(buf), "%s.xml", filename);
//autoshift_delete = false;