Merge pull request #517 from brave/closeTab-crash

Close tab crash
brave · Aug 14, 2015 · d1e681e · d1e681e
2 parents ea3e537 + 50fe921
commit d1e681e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/Application/LinkBubble/src/main/java/com/linkbubble/MainController.java b/Application/LinkBubble/src/main/java/com/linkbubble/MainController.java
@@ -914,6 +914,11 @@ public boolean closeTab(TabView tabView, boolean animateOff, boolean canShowUndo
 
     public boolean closeTab(TabView tabView, Constant.BubbleAction action, boolean animateOff, boolean canShowUndoPrompt) {
 
+        if (tabView == null) {
+            CrashTracking.log("closeTab attempt on null tabView");
+            return false;
+        }
+
         // If the tab is already closing, do nothing. Otherwise we could end up in a weird state,
         // where we attempt to show multiple prompts and crashing upon tab restore.
         if (tabView.mIsClosing == true) {

diff --git a/Application/LinkBubble/src/main/res/xml/changelog.xml b/Application/LinkBubble/src/main/res/xml/changelog.xml
@@ -6,6 +6,7 @@
         <change>NEW: Ability to upload files via HTML file picker inputs. This requires us to ask for the permissions to read from external storage.</change>
         <change>BUG FIX: Fixed text color for light colored theme backgrounds.</change>
         <change>BUG FIX: Fixed previously broken functionality with various websites and image galleries.</change>
+        <change>BUG FIX: Fixed top crashers.</change>
     </release>
 
     <release version="1.5.1">