From db4de60b782a9884305c43f311c0c740d263e164 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Wed, 21 Jan 2015 17:54:11 +0300
Subject: [PATCH] gui/channellist.cpp: disable timeshift stop while timeshift
 playback in progress

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/c6424534e8d748d2e60d46140fce701e3deb2779
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-21 (Wed, 21 Jan 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
---
 src/gui/channellist.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index 126cc8b21..5a8deec63 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -51,6 +51,7 @@
 #include <gui/widget/icons.h>
 #include <gui/widget/messagebox.h>
 #include <gui/widget/hintbox.h>
+#include <gui/movieplayer.h>
 
 #include <system/settings.h>
 #include <gui/customcolor.h>
@@ -651,7 +652,11 @@ int CChannelList::show()
 			}
 		}
 		else if(!edit_state && !empty && msg == CRCInput::RC_stop ) { //stop recording
-			if(CRecordManager::getInstance()->RecordingStatus((*chanlist)[selected]->channel_id))
+			//if(CRecordManager::getInstance()->RecordingStatus((*chanlist)[selected]->channel_id))
+			int recmode = CRecordManager::getInstance()->GetRecordMode((*chanlist)[selected]->channel_id);
+			bool timeshift = recmode & CRecordManager::RECMODE_TSHIFT;
+			bool tsplay = CMoviePlayerGui::getInstance().timeshift;
+			if (recmode && !(timeshift && tsplay))
 			{
 				if (CRecordManager::getInstance()->AskToStop((*chanlist)[selected]->channel_id))
 				{