Merge remote-tracking branch 'tuxbox/master'

This commit is contained in:
Stefan Seyfried
2017-01-22 22:59:39 +01:00
653 changed files with 2136 additions and 2008 deletions

View File

@@ -1417,7 +1417,7 @@ int CRecordManager::exec(CMenuTarget* parent, const std::string & actionKey )
inst->GetRecordString(title, duration);
title += duration;
tostart = (ShowMsg(LOCALE_RECORDING_IS_RUNNING, title.c_str(),
CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NULL, 450, 30) == CMsgBox::mbrYes);
CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NULL, 450, DEFAULT_TIMEOUT) == CMsgBox::mbrYes);
}
if (tostart) {
CRecordManager::getInstance()->Record(live_channel_id);