Skip to content

Commit 7866a61

Browse files
committed
Correct ProcessRequestQueue leak in VideoScan::SetDirs.
When QUERY_VIDEOS was called against the master backend, it would run the video scanner, which would in turn pull the master backend hostname from gCoreContext. Since that queries the value from the master backend, it would stall, never to return, and lock the attached ProcessRequestQueue until the backend was restarted.
1 parent 1a2c872 commit 7866a61

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

mythtv/libs/libmythmetadata/videoscan.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@ VideoScannerThread::~VideoScannerThread()
9090

9191
void VideoScannerThread::SetDirs(QStringList dirs)
9292
{
93-
QString master = gCoreContext->GetMasterHostName();
93+
QString master = gCoreContext->IsMasterBackend() ?
94+
gCoreContext->GetHostName() :
95+
gCoreContext->GetMasterHostName();
9496
QStringList searchhosts, mdirs;
9597
m_offlineSGHosts.clear();
9698

0 commit comments

Comments
 (0)