diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
commit | 623ee73d661e5ed8475cb264511f683407d87365 (patch) | |
tree | 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /media-tv/mythtv/files | |
parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'media-tv/mythtv/files')
-rw-r--r-- | media-tv/mythtv/files/mythtv-29.1-Fix_create_webbrowser_window.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/media-tv/mythtv/files/mythtv-29.1-Fix_create_webbrowser_window.patch b/media-tv/mythtv/files/mythtv-29.1-Fix_create_webbrowser_window.patch new file mode 100644 index 000000000000..168c23379423 --- /dev/null +++ b/media-tv/mythtv/files/mythtv-29.1-Fix_create_webbrowser_window.patch @@ -0,0 +1,61 @@ +Index: mythtv/libs/libmythui/mythuiwebbrowser.cpp +Mythtv bug #13544 +=================================================================== +--- a/libs/libmythui/mythuiwebbrowser.cpp ++++ b/libs/libmythui/mythuiwebbrowser.cpp +@@ -873,4 +873,8 @@ + void MythUIWebBrowser::Init(void) + { ++ // only do the initialisation for widgets not being stored in the global object store ++ if (parent() == GetGlobalObjectStore()) ++ return; ++ + if (m_initialized) + return; +@@ -1128,4 +1132,7 @@ + void MythUIWebBrowser::SetActive(bool active) + { ++ if (!m_browser) ++ return; ++ + if (m_active == active) + return; +@@ -1326,4 +1333,7 @@ + void MythUIWebBrowser::Scroll(int dx, int dy) + { ++ if (!m_browser) ++ return; ++ + QPoint startPos = m_browser->page()->currentFrame()->scrollPosition(); + QPoint endPos = startPos + QPoint(dx, dy); +@@ -1435,4 +1445,7 @@ + void MythUIWebBrowser::UpdateScrollBars(void) + { ++ if (!m_browser) ++ return; ++ + QPoint position = m_browser->page()->currentFrame()->scrollPosition(); + if (m_verticalScrollbar) +@@ -1461,5 +1474,5 @@ + UpdateScrollBars(); + +- if (!m_image) ++ if (!m_image || !m_browser) + return; + +@@ -1480,4 +1493,7 @@ + void MythUIWebBrowser::Pulse(void) + { ++ if (!m_browser) ++ return; ++ + if (m_scrollAnimation.IsActive() && + m_destinationScrollPos != +@@ -1522,4 +1538,7 @@ + bool MythUIWebBrowser::keyPressEvent(QKeyEvent *event) + { ++ if (!m_browser) ++ return false; ++ + QStringList actions; + bool handled = false; |