diff options
| author | Kai Sommerfeld <kai.sommerfeld@gmx.com> | 2020-06-16 07:37:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-16 07:37:40 +0200 |
| commit | 1bcc91bb25b58b94a973c1b470b15505ef38d607 (patch) | |
| tree | 38ccb683f9aa1a566ada9f2c5810659bed1e931b | |
| parent | 7cf8c39a9810d6075675884aae02e32606571a03 (diff) | |
| parent | 723e603f8a42b236308107eabe19b179f134c586 (diff) | |
Merge pull request #18056 from ksooo/leia-pvr-fix-epg-container-race
Leia pvr fix epg container race
| -rw-r--r-- | xbmc/pvr/windows/GUIEPGGridContainer.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/xbmc/pvr/windows/GUIEPGGridContainer.cpp b/xbmc/pvr/windows/GUIEPGGridContainer.cpp index 432a695eeb..506c807d0c 100644 --- a/xbmc/pvr/windows/GUIEPGGridContainer.cpp +++ b/xbmc/pvr/windows/GUIEPGGridContainer.cpp @@ -1593,6 +1593,8 @@ void CGUIEPGGridContainer::LoadLayout(TiXmlElement *layout) m_rulerLayouts.back().LoadLayout(itemElement, GetParentID(), false, m_width, m_height); itemElement = itemElement->NextSiblingElement("rulerlayout"); } + + UpdateLayout(); } std::string CGUIEPGGridContainer::GetDescription() const @@ -1715,7 +1717,6 @@ void CGUIEPGGridContainer::SetTimelineItems(const std::unique_ptr<CFileItemList> { CSingleLock lock(m_critSection); - UpdateLayout(); iRulerUnit = m_rulerUnit; iBlocksPerPage = m_blocksPerPage; fBlockSize = m_blockSize; @@ -1794,6 +1795,8 @@ void CGUIEPGGridContainer::UpdateLayout() oldRulerLayout == m_rulerLayout && oldRulerDateLayout == m_rulerDateLayout) return; // nothing has changed, so don't update stuff + CSingleLock lock(m_critSection); + m_channelHeight = m_channelLayout->Size(VERTICAL); m_channelWidth = m_channelLayout->Size(HORIZONTAL); |