From c832e5e47b6d91a3d805c71848c863696ea8c892 Mon Sep 17 00:00:00 2001
From: Michael Kolb <kolby@google.com>
Date: Fri, 9 Mar 2012 15:08:23 -0800
Subject: Bad Monkey.

    Bug: 6028523

Change-Id: I960bcbb90344a4008f33551a846f2d5e8baeee22
---
 src/com/android/browser/NavigationBarTablet.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/com/android/browser/NavigationBarTablet.java')

diff --git a/src/com/android/browser/NavigationBarTablet.java b/src/com/android/browser/NavigationBarTablet.java
index 026e9030..3403fd7e 100644
--- a/src/com/android/browser/NavigationBarTablet.java
+++ b/src/com/android/browser/NavigationBarTablet.java
@@ -165,9 +165,9 @@ public class NavigationBarTablet extends NavigationBarBase {
 
     @Override
     public void onClick(View v) {
-        if (mBackButton == v) {
+        if ((mBackButton == v) && (mUiController.getCurrentTab() != null)) {
             mUiController.getCurrentTab().goBack();
-        } else if (mForwardButton == v) {
+        } else if ((mForwardButton == v)  && (mUiController.getCurrentTab() != null)) {
             mUiController.getCurrentTab().goForward();
         } else if (mStar == v) {
             Intent intent = mUiController.createBookmarkCurrentPageIntent(true);
-- 
cgit v1.2.3