diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2013-07-30 14:23:09 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-31 08:24:18 +0200 |
| commit | f29bbbde5fa2c8b095d3317d3f935f46febe04ca (patch) | |
| tree | b1c31181f8a822fe89e0d55d98dcd31d2bc4fb4b /src/widgets/widgets/qdockarealayout.cpp | |
| parent | e54ef7f23bf976f264ecb5ca77e080b324f18a62 (diff) | |
Check if the widgetItem is valid before accessing widget() on it
If a state was restored but not all the dockwidgets that were available
before are available at the time of restoration then when dragging a
dockwidget to where the unavailable one is expected to be would cause a
crash.
Change-Id: I829d93041b7950a3546ba4e6c3764b169f276315
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/widgets/widgets/qdockarealayout.cpp')
| -rw-r--r-- | src/widgets/widgets/qdockarealayout.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/widgets/qdockarealayout.cpp b/src/widgets/widgets/qdockarealayout.cpp index ac061e7071..72a463b30b 100644 --- a/src/widgets/widgets/qdockarealayout.cpp +++ b/src/widgets/widgets/qdockarealayout.cpp @@ -1471,7 +1471,7 @@ QList<int> QDockAreaLayoutInfo::indexOf(QWidget *widget) const continue; } - if (!(item.flags & QDockAreaLayoutItem::GapItem) && item.widgetItem->widget() == widget) { + if (!(item.flags & QDockAreaLayoutItem::GapItem) && item.widgetItem && item.widgetItem->widget() == widget) { QList<int> result; result << i; return result; |