ExternalRecorder: If ExternalStreamHandler fails to init, release it.

MythTV · Dec 28, 2020 · 97b0843 · 97b0843
1 parent 1cd6fa5
commit 97b0843
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/mythtv/libs/libmythtv/recorders/ExternalChannel.cpp b/mythtv/libs/libmythtv/recorders/ExternalChannel.cpp
@@ -45,6 +45,7 @@ bool ExternalChannel::Open(void)
     if (!m_streamHandler || m_streamHandler->HasError())
     {
         LOG(VB_GENERAL, LOG_ERR, LOC + "Open failed");
+        Close();
         return false;
     }
 

diff --git a/mythtv/libs/libmythtv/recorders/ExternalRecChannelFetcher.cpp b/mythtv/libs/libmythtv/recorders/ExternalRecChannelFetcher.cpp
@@ -36,6 +36,11 @@ ExternalRecChannelFetcher::ExternalRecChannelFetcher(int cardid,
     , m_command(std::move(cmd))
 {
     m_streamHandler = ExternalStreamHandler::Get(m_command, m_cardid, m_cardid);
+    if (!m_streamHandler || m_streamHandler->HasError())
+    {
+        LOG(VB_GENERAL, LOG_ERR, LOC + "Open failed");
+        Close();
+    }
 }
 
 ExternalRecChannelFetcher::~ExternalRecChannelFetcher(void)

diff --git a/mythtv/libs/libmythtv/recorders/ExternalRecorder.cpp b/mythtv/libs/libmythtv/recorders/ExternalRecorder.cpp
@@ -148,6 +148,7 @@ bool ExternalRecorder::Open(void)
         return true;
     }
 
+    Close();
     LOG(VB_GENERAL, LOG_ERR, LOC + "Open failed");
     return false;
 }

diff --git a/mythtv/libs/libmythtv/recorders/ExternalSignalMonitor.cpp b/mythtv/libs/libmythtv/recorders/ExternalSignalMonitor.cpp
@@ -47,7 +47,11 @@ ExternalSignalMonitor::ExternalSignalMonitor(int db_cardnum,
                                                   m_channel->GetInputID(),
                                                   m_channel->GetMajorID());
     if (!m_streamHandler || m_streamHandler->HasError())
+    {
         LOG(VB_GENERAL, LOG_ERR, LOC + "Open failed");
+        if (m_streamHandler)
+            ExternalStreamHandler::Return(m_streamHandler, m_inputid);
+    }
     else
         m_lockTimeout = GetLockTimeout() * 1000;
 
@@ -63,7 +67,8 @@ ExternalSignalMonitor::~ExternalSignalMonitor()
 {
     LOG(VB_CHANNEL, LOG_INFO, LOC + "dtor");
     ExternalSignalMonitor::Stop();
-    ExternalStreamHandler::Return(m_streamHandler, m_inputid);
+    if (m_streamHandler)
+        ExternalStreamHandler::Return(m_streamHandler, m_inputid);
 }
 
 /** \fn ExternalSignalMonitor::Stop(void)