diff -r a359256acfc6 -r c8a366e56285 webengine/osswebengine/WebKit/s60/webview/BrCtl.cpp --- a/webengine/osswebengine/WebKit/s60/webview/BrCtl.cpp Thu Aug 27 07:44:59 2009 +0300 +++ b/webengine/osswebengine/WebKit/s60/webview/BrCtl.cpp Thu Sep 24 12:53:48 2009 +0300 @@ -238,12 +238,15 @@ } CFbsBitmap* HistoryHandler::scaledPage() -{ - CFbsBitmap* scaledPage = m_brctl->wmlMode() ? m_brctl->wmlPageScaler().ScaledPage() : - m_brctl->webView()->pageScaler()->ScaledPage(); - - return scaledPage; - +{ + CFbsBitmap* scaledPage = NULL; + if ( m_brctl->wmlMode() && &m_brctl->wmlPageScaler() ) { + scaledPage = m_brctl->wmlPageScaler().ScaledPage(); + } + else if( !m_brctl->wmlMode() && m_brctl->webView()->pageScaler() ) { + scaledPage = m_brctl->webView()->pageScaler()->ScaledPage(); + } + return scaledPage; } void HistoryHandler::makeVisible(bool visible) @@ -2452,3 +2455,5 @@ { m_webView->HandlePointerBufferReadyL(); } + +