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

Revert "driver/record: auto-terminate temporary timeshift recordings"

Browse Source 
commit can stop plain record instead of timeshift, and breaks auto-timeshift concept

This reverts commit aaa305dd57.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6ad1a64f73
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2014-10-01 16:10:36 +04:00
parent 0aee7a5f08
commit a4e40b3c8f
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/record.cpp
View File

@@ -1277,9 +1277,7 @@ void CRecordManager::StartTimeshift()
if(res)
{
CMoviePlayerGui::getInstance().exec(NULL, tmode);
if(g_settings.temp_timeshift)
Stop(live_channel_id);
else if (!(g_settings.auto_timeshift && autoshift))
if(g_settings.temp_timeshift && !g_settings.auto_timeshift && autoshift)
ShowMenu();
}
}