From a4e40b3c8f1f3c5e30a8f16bc8863c0da0b9f6af 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 aaa305dd57e5b154f8a63e68f93911fbe6cd1b1d. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/6ad1a64f7327106ad55afdfcd9a703f547848b7e Author: [CST] Focus Date: 2014-10-01 (Wed, 01 Oct 2014) ------------------ This commit was generated by Migit --- 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(); } }