From 52cebc426ea14d4e9a0123f600130026d1d75e13 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Tue, 26 Mar 2013 12:37:47 +0400 Subject: [PATCH] driver/record.cpp: dont show record starting/stopping window and stop menu, if auto timeshift enabled --- src/driver/record.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/driver/record.cpp b/src/driver/record.cpp index 48b439f0a..1fe3122ac 100644 --- a/src/driver/record.cpp +++ b/src/driver/record.cpp @@ -144,7 +144,8 @@ record_error_msg_t CRecordInstance::Start(CZapitChannel * channel) time_t msg_start_time = time(0); CHintBox hintBox(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_RECORDING_START)); - hintBox.paint(); + if (!(autoshift && g_settings.auto_timeshift)) + hintBox.paint(); tsfile = std::string(filename) + ".ts"; @@ -221,7 +222,8 @@ bool CRecordInstance::Stop(bool remove_event) recMovieInfo->length = (int) round((double) (end_time - start_time) / (double) 60); CHintBox hintBox(LOCALE_MESSAGEBOX_INFO, rec_stop_msg.c_str()); - hintBox.paint(); + if (!(autoshift && g_settings.auto_timeshift)) + hintBox.paint(); printf("%s: channel %" PRIx64 " recording_id %d\n", __func__, channel_id, recording_id); SaveXml(); @@ -1292,7 +1294,7 @@ void CRecordManager::StartTimeshift() if(res) { CMoviePlayerGui::getInstance().exec(NULL, tmode); - if(g_settings.temp_timeshift) + if(g_settings.temp_timeshift && !g_settings.auto_timeshift) ShowMenu(); } }