commit 700142f66bf8f8f14ed25a6a9f67f6c1f44a3dbc
author John Reck <jreck@android.com> Thu Sep 13 09:54:02 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 13 09:54:02 2012 -0700
tree 66155195c6c941a7ece09ed46af315e969a4b110
parent 70c7844ff0156926dfa58896c911de71982bd638
parent b7ee3b51919842cd26eb865d28cd9ce8e3ba5a2e

am b7ee3b51: Merge "BrowserSettings required a Controller sometimes"

* commit 'b7ee3b51919842cd26eb865d28cd9ce8e3ba5a2e':
  BrowserSettings required a Controller sometimes

src/com/android/browser/BrowserSettings.java

diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 7d3195a..4555c18 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -372,11 +372,11 @@
         if (PREF_SEARCH_ENGINE.equals(key)) {
             updateSearchEngine(false);
         } else if (PREF_FULLSCREEN.equals(key)) {
-            if (mController.getUi() != null) {
+            if (mController != null && mController.getUi() != null) {
                 mController.getUi().setFullscreen(useFullscreen());
             }
         } else if (PREF_ENABLE_QUICK_CONTROLS.equals(key)) {
-            if (mController.getUi() != null) {
+            if (mController != null && mController.getUi() != null) {
                 mController.getUi().setUseQuickControls(sharedPreferences.getBoolean(key, false));
             }
         } else if (PREF_LINK_PREFETCH.equals(key)) {