diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-26 12:28:31 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-26 12:28:53 +0200 |
| commit | 6e5818f2bbc8443b9308252a5e1543e014ef439d (patch) | |
| tree | 07922adee2f13e818b9439c8a0bdf871dda59039 /src/widgets/widgets/qwidgetanimator.cpp | |
| parent | 32aac0a1c009ee940920fd12f277180dd80b8eff (diff) | |
| parent | deac55becd18efa4504eb686a1bb8081a5cd488a (diff) | |
Merge remote-tracking branch 'gerrit/master' into newdocs
Change-Id: I10cf9f915c602c8e5a0e7d7c9e17b7bc5ca00640
Diffstat (limited to 'src/widgets/widgets/qwidgetanimator.cpp')
| -rw-r--r-- | src/widgets/widgets/qwidgetanimator.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/widgets/widgets/qwidgetanimator.cpp b/src/widgets/widgets/qwidgetanimator.cpp index edd9d63081..aef967bd65 100644 --- a/src/widgets/widgets/qwidgetanimator.cpp +++ b/src/widgets/widgets/qwidgetanimator.cpp @@ -59,7 +59,9 @@ void QWidgetAnimator::abort(QWidget *w) return; QPropertyAnimation *anim = *it; m_animation_map.erase(it); - anim->stop(); + if (anim) { + anim->stop(); + } #ifndef QT_NO_MAINWINDOW m_mainWindowLayout->animationFinished(w); #endif |