Bug 1074413 - Add null check for Tab when handling potentially stale messages in JavaPanZoomController r=kats

2014-09-29 23:39:34 -04:00
parent 85e8b27d48
commit 0ba29ffe90
1 changed files with 5 additions and 0 deletions
--- a/mobile/android/base/gfx/JavaPanZoomController.java
+++ b/mobile/android/base/gfx/JavaPanZoomController.java
@@ -275,6 +275,11 @@ class JavaPanZoomController
            } else if (MESSAGE_TOUCH_LISTENER.equals(event)) {
                int tabId = message.getInt("tabID");
                final Tab tab = Tabs.getInstance().getTab(tabId);
+                // Make sure we still have a Tab
+                if (tab == null) {
+                    return;
+                }
+
                tab.setHasTouchListeners(true);
                mTarget.post(new Runnable() {
                    @Override