From 4fb1d1940695030cf33e21089d8dc2f814f65d28 Mon Sep 17 00:00:00 2001
From: DboxOldie <>
Date: Sat, 23 Jan 2021 23:18:06 +0100
Subject: [PATCH] generate correct camask

 Conflicts:
	src/driver/record.cpp
---
 src/driver/record.cpp   | 5 +++--
 src/driver/streamts.cpp | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/driver/record.cpp b/src/driver/record.cpp
index e4670fac8..2370e834a 100644
--- a/src/driver/record.cpp
+++ b/src/driver/record.cpp
@@ -336,13 +336,14 @@ bool CRecordInstance::Stop(bool remove_event)
 	printf("%s: file %s.ts\n", __FUNCTION__, filename);
 	SaveXml();
 	/* Stop do close fd - if started */
+	/* Stop do close fd - if started */
 	record->Stop();
 
+	CCamManager::getInstance()->Stop(channel_id, CCamManager::RECORD);
+
 	if(!autoshift)
 		CFEManager::getInstance()->unlockFrontend(frontend, true);//FIXME testing
 
-	CCamManager::getInstance()->Stop(channel_id, CCamManager::RECORD);
-
 	if (autoshift && g_settings.timeshift_delete)
 		CMoviePlayerGui::getInstance().deleteTimeshift();
 
diff --git a/src/driver/streamts.cpp b/src/driver/streamts.cpp
index 98d467440..ed8343371 100644
--- a/src/driver/streamts.cpp
+++ b/src/driver/streamts.cpp
@@ -217,12 +217,13 @@ void CStreamInstance::run()
 			Send(r);
 	}
 
+	CCamManager::getInstance()->Stop(channel_id, CCamManager::STREAM);
+
 #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
 	if(frontend)
 		CFEManager::getInstance()->unlockFrontend(frontend);
 	//CZapit::getInstance()->SetRecordMode(false);
 #endif
-	CCamManager::getInstance()->Stop(channel_id, CCamManager::STREAM);
 
 	printf("CStreamInstance::run: exiting %" PRIx64 " (%d fds)\n", channel_id, (int)fds.size());