diff options
| author | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2010-09-02 12:03:50 (GMT) |
|---|---|---|
| committer | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2010-09-02 12:55:39 (GMT) |
| commit | 9d88ff485e93e9701719263ce0a46cb86b0398ca (patch) | |
| tree | 712e6b8ec3a9d15c3bc115d2ba1ce560e8c296e5 /src/gui/kernel/qapplication_s60.cpp | |
| parent | cf0917cfc3b040e9650953560038f92cac42b6e3 (diff) | |
| download | Qt-9d88ff485e93e9701719263ce0a46cb86b0398ca.zip Qt-9d88ff485e93e9701719263ce0a46cb86b0398ca.tar.gz Qt-9d88ff485e93e9701719263ce0a46cb86b0398ca.tar.bz2 | |
Prevent null pointer dereference
Task-number: QTBUG-13204
Reviewed-by: axis
Diffstat (limited to 'src/gui/kernel/qapplication_s60.cpp')
| -rw-r--r-- | src/gui/kernel/qapplication_s60.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index 4ed4ba3..21f930e 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -129,7 +129,7 @@ void QS60Data::setStatusPaneAndButtonGroupVisibility(bool statusPaneVisible, boo statusPaneVisibilityChanged = (s->IsVisible() != statusPaneVisible); s->MakeVisible(statusPaneVisible); } - if (buttonGroupVisibilityChanged && !statusPaneVisibilityChanged) + if (buttonGroupVisibilityChanged && !statusPaneVisibilityChanged && QApplication::activeWindow()) // Ensure that control rectangle is updated static_cast<QSymbianControl *>(QApplication::activeWindow()->winId())->handleClientAreaChange(); } |