summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2020-06-23 17:28:08 +0200
committerFlorian Bruhin <me@the-compiler.org>2020-06-23 17:29:44 +0200
commit86d794320343e58467d34daad8cc9a1b8011a512 (patch)
tree225534996d60c2d714baf9cbce0b118ec7d616ea
parent1adb46420e4692f86626dc2b068f68f810b91048 (diff)
downloadqutebrowser-86d794320343e58467d34daad8cc9a1b8011a512.tar.gz
qutebrowser-86d794320343e58467d34daad8cc9a1b8011a512.zip
Re-add segfault workarounds
Some tests (e.g. in test_invocations.py) still seem to segfault without this. This partially reverts 87d7dd93420ab92a1a209919297371dc0fadcecd. See #2261
-rw-r--r--qutebrowser/mainwindow/tabbedbrowser.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index 7323bfff1..db9707eca 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -474,6 +474,12 @@ class TabbedBrowser(QWidget):
tab.private_api.shutdown()
self.widget.removeTab(idx)
+
+ if not qtutils.version_check('5.12'):
+ # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-58982
+ # Seems to affect Qt 5.7-5.11 as well.
+ tab.layout().unwrap()
+
tab.deleteLater()
def undo(self):