mirror of
https://github.com/KDE/konsole.git
synced 2026-05-19 03:57:43 -04:00
The containerWidget is used by ViewSplit, which calls addWidget, which in turn sets the parent. So don't delete it if it has already been deleted.
If we are sure that the containerWidget will be parented, we can avoid the QPointer svn path=/trunk/KDE/kdebase/apps/konsole/; revision=869659
This commit is contained in:
@@ -585,7 +585,8 @@ void TabbedViewContainer::dynamicTabBarVisibility()
|
||||
}
|
||||
TabbedViewContainer::~TabbedViewContainer()
|
||||
{
|
||||
_containerWidget->deleteLater();
|
||||
if (!_containerWidget.isNull())
|
||||
_containerWidget->deleteLater();
|
||||
}
|
||||
|
||||
void TabbedViewContainer::startTabDrag(int tab)
|
||||
@@ -780,7 +781,8 @@ StackedViewContainer::StackedViewContainer(QObject* parent)
|
||||
}
|
||||
StackedViewContainer::~StackedViewContainer()
|
||||
{
|
||||
_containerWidget->deleteLater();
|
||||
if (!_containerWidget.isNull())
|
||||
_containerWidget->deleteLater();
|
||||
}
|
||||
QWidget* StackedViewContainer::containerWidget() const
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user