commit 52eafbb7601eac6ce0011edeb2a73ffccb6fb751
author Michael Kolb <kolby@google.com> Mon May 07 14:23:58 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 07 14:23:58 2012 -0700
tree c0a9f6eb366552a7f95a6b51f4773baaa223146c
parent 775a6af1b5724475df432ac15faf3abb554b1ef4
parent 5fea4a202fd54c289b4316cbca9c19b256eb3cb3

Merge "fix monkey NPE" into jb-dev

src/com/android/browser/PieControl.java

diff --git a/src/com/android/browser/PieControl.java b/src/com/android/browser/PieControl.java
index abe8d37..7c4291c 100644
--- a/src/com/android/browser/PieControl.java
+++ b/src/com/android/browser/PieControl.java
@@ -115,7 +115,9 @@
         int n = mUiController.getTabControl().getTabCount();
         mTabsCount.setText(Integer.toString(n));
         Tab tab = mUiController.getCurrentTab();
-        mForward.setEnabled(tab.canGoForward());
+        if (tab != null) {
+            mForward.setEnabled(tab.canGoForward());
+        }
         return true;
     }