am 3eefc126: check for webviewcore before reading settings

Merge commit '3eefc126e5a0b4af4738332e8d43fe2e2d00424c' into froyo-plus-aosp

* commit '3eefc126e5a0b4af4738332e8d43fe2e2d00424c':
  check for webviewcore before reading settings
This commit is contained in:
Cary Clark
2010-04-05 12:30:12 -07:00
committed by Android Git Automerger

View File

@@ -3974,7 +3974,7 @@ public class WebView extends AbsoluteLayout
// false for the first parameter
}
} else {
if (getSettings().getBuiltInZoomControls()
if (mWebViewCore != null && getSettings().getBuiltInZoomControls()
&& !getZoomButtonsController().isVisible()) {
/*
* The zoom controls come in their own window, so our window