summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilson Michaels <thebitpit@earthlink.net>2020-03-29 18:59:38 -0500
committerAndreas Sturmlechner <asturm@gentoo.org>2020-04-03 18:39:03 +0200
commit1c3cea9bb7e24aea50f3826f36dae73ba76270db (patch)
treeae0402b64725f004b46bac93cddf063c489afb08 /media-tv/mythtv/files
parentmedia-tv/mythtv: Delete old revisions (diff)
downloadgentoo-1c3cea9bb7e24aea50f3826f36dae73ba76270db.tar.gz
gentoo-1c3cea9bb7e24aea50f3826f36dae73ba76270db.tar.bz2
gentoo-1c3cea9bb7e24aea50f3826f36dae73ba76270db.zip
media-tv/mythtv: Fix create webbrowser window
Closes: https://bugs.gentoo.org/713736 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Wilson Michaels <thebitpit@earthlink.net> Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'media-tv/mythtv/files')
-rw-r--r--media-tv/mythtv/files/mythtv-29.1-Fix_create_webbrowser_window.patch61
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;