From 6ad1a64f7327106ad55afdfcd9a703f547848b7e Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Wed, 1 Oct 2014 16:10:36 +0400 Subject: [PATCH] Revert "driver/record: auto-terminate temporary timeshift recordings" commit can stop plain record instead of timeshift, and breaks auto-timeshift concept This reverts commit c9d78e1a9c814625d3daadff61d9074e5bcdd55e. --- src/driver/record.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/driver/record.cpp b/src/driver/record.cpp index 6032d376a..61fe5c9c4 100644 --- a/src/driver/record.cpp +++ b/src/driver/record.cpp @@ -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(); } }