diff options
| author | Shane Kearns <shane.kearns@sosco.com> | 2009-11-03 08:47:25 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@sosco.com> | 2009-11-03 12:55:18 (GMT) |
| commit | 5308b1c607c1209822078d8aae329308c8017636 (patch) | |
| tree | ffb9126fb6175cb1c21627e6418fba96a4fe1983 /src | |
| parent | 92a393940d2dc3a9e2cd4f27e4ca62643c816f6f (diff) | |
| download | Qt-5308b1c607c1209822078d8aae329308c8017636.zip Qt-5308b1c607c1209822078d8aae329308c8017636.tar.gz Qt-5308b1c607c1209822078d8aae329308c8017636.tar.bz2 | |
Fix for potential crash in S60 style
Leaving function called without a TRAP
Reviewed-by: Sami Merila
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/styles/qs60style_s60.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp index 678844c..0cd87bd 100644 --- a/src/gui/styles/qs60style_s60.cpp +++ b/src/gui/styles/qs60style_s60.cpp @@ -1382,13 +1382,13 @@ QSize QS60StylePrivate::naviPaneSize() QSize QS60StyleModeSpecifics::naviPaneSize() { CAknNavigationControlContainer* naviContainer; - if (S60->statusPane()) - naviContainer = static_cast<CAknNavigationControlContainer*> - (S60->statusPane()->ControlL(TUid::Uid(EEikStatusPaneUidNavi))); - if (naviContainer) - return QSize(naviContainer->Size().iWidth, naviContainer->Size().iHeight); - else - return QSize(0,0); + if (S60->statusPane()) { + TRAPD(err, naviContainer = static_cast<CAknNavigationControlContainer*> + (S60->statusPane()->ControlL(TUid::Uid(EEikStatusPaneUidNavi)))); + if (err==KErrNone) + return QSize(naviContainer->Size().iWidth, naviContainer->Size().iHeight); + } + return QSize(0,0); } #endif // Q_WS_S60 |